testing working

Author: ernest-phillips

app/auth/auth.router.js

@@ -49,23 +49,13 @@ authRouter.post('/refresh', jwtPassportMiddleware, (request, response) => {
     });
 });
 
-<<<<<<< HEAD
-authRouter.post('/logout', localPassportMiddleware, (req, res) => {
-        res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
-    }
-    module.exports = {
-        authRouter
-    });
-
-=======
 authRouter.post('/logout', (req, res) => {
 
     res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
     res.json({
 
     })
 });
->>>>>>> 7867560ecc9fefea91206abd0e5963e313dce6b3
 module.exports = {
     authRouter
 };

app/server.js

@@ -37,7 +37,7 @@ passport.use(jwtStrategy);
 app.use(morgan('combined')); //allows morgan to intercept and alog all http requests to console
 app.use(express.json()); // Required so AJAX request JSON data payload can be parsed and saved into request.body
 app.use(express.static('./public'));
-app.use(express.urlencoded());
+app.use(express.urlencoded({ extended: true }));
 
 //ROUTER SETUP
 app.use('/api/auth', authRouter);

app/workout/workout.model.js

@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
 const Joi = require("joi");
-const dateFns = require('date-fns');
+
 
 
 const workoutSchema = new mongoose.Schema({

test/workout.test.js

@@ -109,29 +109,27 @@ describe('Integration tests for: /api/home', function() {
             .get('/api/home')
             .set('Authorization', `Bearer ${jwtToken}`)
             .then(res => {
+                console.log("The body:",res.body[0].sets);
                 expect(res).to.have.status(HTTP_STATUS_CODES.OK);
                 expect(res).to.be.json;
                 expect(res.body).to.be.a('array');
                 expect(res.body).to.have.lengthOf.at.least(1);
-            console.log("The body:",res.body[0].sets);
-                const workout = res.body[0].sets;
 
-                expect(workout).to.include.keys('user', 'exercise', 'set', 'reps');
-                // expect(workout.user).to.be.a('object');
-                // expect(workout.user).to.include.keys('name', 'email', 'username');
-                // expect(workout.user).to.nested.include({
-                //     id: testUser.id,
-                //     username: testUser.username,
-                //     email: testUser.email,
-                //     name: testUser.name
-                // });
+                const workout = res.body[0];
+                console.log("User workout:", workout)
+            
+                expect(workout).to.include.keys('user','sets');
+                expect(workout.sets).to.include.keys( 'exercise', 'set', 'reps')
+                expect(workout.user).to.be.a('string');
+                
             });
     });
 
     it('Should return a specific workout', function() {
         let foundWorkout;
         return Workout.find()
             .then(workouts => {
+                
                 expect(workouts).to.be.a('array');
                 expect(workouts).to.have.lengthOf.at.least(1);
                 foundWorkout = workouts[0];
@@ -141,10 +139,12 @@ describe('Integration tests for: /api/home', function() {
                     .set('Authorization', `Bearer ${jwtToken}`);
             })
             .then(res => {
+                
                 expect(res).to.have.status(HTTP_STATUS_CODES.OK);
                 expect(res).to.be.json;
-                expect(res.body).to.be.a('object');
-                expect(res.body).to.include.keys('user', 'exercise', 'set', 'reps');
+                // expect(res.body).to.be.a('object');
+                expect(res.body).to.include.keys('user','sets');
+                expect(res.body.sets).to.include.keys('exercise', 'set', 'reps');
 
             });
     });
@@ -183,11 +183,6 @@ describe('Integration tests for: /api/home', function() {
     }
 
     function createFakerWorkout() {
-        return {
-            exercise: faker.lorem.word(),
-            set: faker.random.number(),
-            reps: faker.random.number(),
-
-        };
+        return  {sets:{exercise: faker.lorem.word(),set: faker.random.number(),reps: faker.random.number()}};
     }
 });