committed

Author: ernest-phillips

app/config.js

@@ -11,7 +11,7 @@ module.exports = {
   },
 
   // MONGO_URL: process.env.MONGO_URL || 'mongodb://localhost:27017/fit-journal',
-  MONGO_URL: process.env.MONGO_URL || 'mongodb://ds237932.mlab.com:37932/fit-journal',
+  MONGO_URL: process.env.MONGO_URL || 'mongodb:admin:"W!nner05"//ds237932.mlab.com:37932/fit-journal',
   TEST_MONGO_URL: process.env.TEST_MONGO_URL || 'mongodb://localhost:27017/test-fit-journal',
   JWT_SECRET: process.env.JWT_SECRET || 'default',
   JWT_EXPIRY: process.env.JWT_EXPIRY || '7d',

app/workout/workout.model.js

@@ -1,5 +1,10 @@
 const mongoose = require("mongoose");
 const Joi = require("joi");
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
 
 const workoutSchema = new mongoose.Schema({
     user: {

public/auth.page.js

@@ -25,6 +25,7 @@ function onSignUpSubmit(event) {
         },
         onError: err => {
             alert('There was a problem processing your request, please try again later.');
+
         }
     });
 }

test/workout.test.js

@@ -107,11 +107,25 @@ describe('Integration tests for: /api/home', function() {
             .get('/api/home')
             .set('Authorization', `Bearer ${jwtToken}`)
             .then(res => {
+<<<<<<< HEAD
+                console.log("The body:",res.body[0].sets);
+=======
                 console.log("The body:", res.body[0].sets);
+>>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
                 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);
+<<<<<<< HEAD
+            
+                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');
+                
+=======
 
                 const workout = res.body[0];
                 console.log("User workout:", workout)
@@ -120,14 +134,19 @@ describe('Integration tests for: /api/home', function() {
                 expect(workout.sets).to.include.keys('exercise', 'set', 'reps')
                 expect(workout.user).to.be.a('string');
 
+>>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
             });
     });
 
     it('Should return a specific workout', function() {
         let foundWorkout;
         return Workout.find()
             .then(workouts => {
+<<<<<<< HEAD
+                
+=======
 
+>>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
                 expect(workouts).to.be.a('array');
                 expect(workouts).to.have.lengthOf.at.least(1);
                 foundWorkout = workouts[0];
@@ -137,11 +156,19 @@ describe('Integration tests for: /api/home', function() {
                     .set('Authorization', `Bearer ${jwtToken}`);
             })
             .then(res => {
+<<<<<<< HEAD
+                
+                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','sets');
+=======
 
                 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', 'sets');
+>>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
                 expect(res.body.sets).to.include.keys('exercise', 'set', 'reps');
 
             });
@@ -181,6 +208,10 @@ describe('Integration tests for: /api/home', function() {
     }
 
     function createFakerWorkout() {
+<<<<<<< HEAD
+        return  {sets:{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() } };
+>>>>>>> dff35dff0e6fd194376bd54c2775744a4a60aa8b
     }
 });