Merge pull request #63 from oslabs-beta/scout

Co-authored-by: Sarah Moosa <[email protected]> Co-authored-by: Tiffany Chau <[email protected]> Co-authored-by: Jack Yuan <[email protected]> Co-authored-by: Cedar Cooper <[email protected]> Co-authored-by: Drew Manley <[email protected]>

Author: CedarCooper

__tests__/ServerRoutes.test.js

@@ -4,19 +4,33 @@ const response = require('supertest');
 const express = require('express');
 import {describe, beforeEach, expect, test, jest} from '@jest/globals';
 const app = express();
+
 const signupRouter = require('../server/routes/signupRouter');
+const loginRouter = require('../server/routes/loginRouter');
+const adminRouter = require('../server/routes/adminRouter');
+const accountRouter = require('../server/routes/accountRouter');
+const apiRouter = require('../server/routes/apiRouter');
+const dbRouter = require('../server/routes/dbRouter');
+const initRouter = require('../server/routes/initRouter');
+const logoutRouter = require('../server/routes/logoutRouter');
 const settingsRouter = require('../server/routes/settingsRouter');
 
 
 
-
 app.use('/test', (req, res) => {
   res.status(200).json({
     success: true,
   });
 });
 app.use('/signup', signupRouter);
 app.use('/settings', settingsRouter);
+app.use('/init', initRouter);
+app.use('/login', loginRouter);
+app.use('/admin', adminRouter);
+app.use('/account', accountRouter);
+app.use('/api', apiRouter);
+app.use('/db', dbRouter);
+app.use('/logout', logoutRouter);
 
 xdescribe('/test route', () => {
   test('get request to test route', (done) => {
@@ -55,22 +69,24 @@ xdescribe('/test route', () => {
 
 describe('/signup route', () => {
   test('get request', async () => {
-    return request(app)
+    await request(app)
       .get('/signup')
-      .send({ username: 'test', email: '[email protected]', password: 'password' })
+      // .send({ username: 'test', email: 'test@test.com', password: 'password' })
       .expect('Content-Type', 'application/json; charset=utf-8') 
       .expect(200)
       .expect(response);
   });
-  xtest('post request', async () => {
+  test('post request', async () => {
     await request(app)
       .post('/signup')
       .send({
-        username: 'test',
+        username: 'testwer',
         email: '[email protected]',
-        password: 'password',
+        password: 'passwqw',
         phone: '+1555555555',
       })
+      .set('Accept', 'application/json')
+      .expect(200)
       .expect('Content-Type', 'application/json; charset=utf-8');
   });
 });
@@ -82,35 +98,97 @@ describe('Settings route', () =>{
       .get('/settings')
       .expect('Content-Type', 'application/json; charset=utf-8')
       .expect(200)
-      .expect(response)
+      .expect(response);
   });
   xtest('Post request', async () => {
     await request(app)
-    .post('/settings/insert')
-    .send({
-      container: ['test', 'value'],
-      name: 'testname',
-      metric: 'hello'
-    })
-    .expect('Content-Type', 'application/json; charset=utf-8')
-    .expect(200)
-    .expect(response)
-  })
+      .post('/settings/insert')
+      .send({
+        container: ['test', 'value'],
+        name: 'testname',
+        metric: 'hello'
+      })
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response);
+  });
 });
+
 // logout route
+describe('Logout Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/logout')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
 
 // login route
+describe('Login Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/login')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
 
 // init route
+describe('Init Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/init')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
 
 // db route
-
+describe('Db Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/db')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
 // api route
-
+describe('Api Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/api')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
 // admin route
-
+describe('Admin Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/admin')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
 // account route
 
+describe('Account Route', () => {
+  test('Get request', () => {
+    request(app)
+      .get('/account')
+      .expect('Content-Type', 'application/json; charset=utf-8')
+      .expect(200)
+      .expect(response); 
+  });
+});
+
 // const server = require('../server/app');
 
 // const request = supertest(server);