refactored mockdata

server/controllers/auth-controller.js

@@ -1,4 +1,3 @@
-import '@babel/polyfill';
 import db from '../models';
 import { registerSchema } from '../utils/validators';
 import env from '../config/env-config';
@@ -60,7 +59,7 @@ class UsersController {
               generateVerificationLink(verificationToken)
             )
             .then(() => {
-              successResponse(res, { user, emailSent: true }, 201);
+              return successResponse(res, { user, emailSent: true }, 201);
             })
             .catch(() => {
               successResponse(res, { user, emailSent: false }, 201);
@@ -99,7 +98,7 @@ class UsersController {
         ([rowsAffected]) => {
           if (!rowsAffected) errorResponse(res, 'no user found to verify', 400);
           else if (rowsAffected === 1) {
-            successResponse(res, { verified: true }, 200);
+            return successResponse(res, { verified: true }, 200);
           }
         }
       );
@@ -114,14 +113,17 @@ class UsersController {
           'invalid token'
         ].includes(e.message)
       ) {
-        errorResponse(res, 'Invalid token, verification unsuccessful', 400);
-      } else {
-        errorResponse(
+        return errorResponse(
           res,
-          'Something went wrong, verification unsuccessful',
-          500
+          'Invalid token, verification unsuccessful',
+          400
         );
       }
+      errorResponse(
+        res,
+        'Something went wrong, verification unsuccessful',
+        500
+      );
     }
   }
 

server/controllers/follow-controller.js

@@ -25,7 +25,7 @@ export default class Follow {
         errorResponse(
           res,
           {
-            message: 'you cannot follow yourself'
+            message: 'you are not allowed to yourself'
           },
           400
         );
@@ -80,8 +80,7 @@ export default class Follow {
       });
       if (users.length < 1) {
         return successResponse(res, {
-          message: 'nobody is currently following you',
-          followers: users
+          message: 'nobody following you currently'
         });
       }
       const num = users.length;
@@ -117,7 +116,7 @@ export default class Follow {
       });
       if (following.length < 1) {
         return successResponse(res, {
-          message: 'you are not following anyone',
+          message: 'you are currently not following anyone',
           following
         });
       }
@@ -144,13 +143,13 @@ export default class Follow {
     try {
       if (username === req.user.username) {
         return errorResponse(res, {
-          message: 'you cannot unfollow yourself'
+          message: 'you are not allowed to unfollow yourself'
         });
       }
 
       await Follower.destroy({ where: { userId: id } });
       return successResponse(res, {
-        message: `${username} has been unfollowed`
+        message: `you just unfollowed ${username}`
       });
     } catch (err) {
       return errorResponse(res, err.message);

server/middlewares/index.js → server/middlewares/users-middleware.js

@@ -3,7 +3,7 @@ import { errorResponse, verifyToken } from '../utils/helpers';
 
 const { User } = db;
 /**
- *Users endpoint middlewares
+ *Users endpoint middleware
  *
  * @export
  * @class UsersMiddleware

server/routes/profile-routes.js

@@ -0,0 +1,15 @@
+import { Router } from 'express';
+import User from '../middlewares/users-middleware';
+import profileController from '../controllers/profile-controller';
+import followcontroller from '../controllers/follow-controller';
+
+const router = new Router();
+router.get('/', User.validUser, profileController.getAll);
+router.get('/:username', User.validUser, profileController.getProfile);
+router.post('/:username/follow', User.validUser, followcontroller.followUser);
+router.delete(
+  '/:username/follow',
+  User.validUser,
+  followcontroller.unfollowUser
+);
+export default router;

server/routes/user-routes.js

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import User from '../middlewares/index';
+import User from '../middlewares/users-middleware';
 import userController from '../controllers/user-controller';
 import followController from '../controllers/follow-controller';
 

test/mockdata/mock.js

@@ -1,13 +1,13 @@
 import faker from 'faker';
 
-export const user1 = {
-  username: faker.internet.userName(),
-  email: faker.internet.email(),
-  password: 'esiaguleticia1234'
-
-};
-export const user2 = {
-  username: faker.internet.userName(),
-  email: faker.internet.email(),
-  bio: 'i am not going',
-};
+/**
+ * @function MockData
+ * @return {object} user
+ */
+export default function mockData() {
+  return {
+    username: faker.random.alphaNumeric(10),
+    email: faker.internet.email(),
+    password: faker.random.alphaNumeric(10)
+  };
+}

test/users.spec.js

@@ -3,20 +3,13 @@ import chaiHttp from 'chai-http';
 import faker from 'faker';
 import server from '../server';
 import { generateToken } from '../server/utils/helpers';
+import generateRandomUser from './mockdata/mock';
 
 chai.use(chaiHttp);
 
-const user1 = {
-  username: faker.random.alphaNumeric(10),
-  email: faker.internet.email(),
-  password: faker.random.alphaNumeric(10)
-};
-
-const user2 = {
-  username: faker.random.alphaNumeric(10),
-  email: faker.internet.email(),
-  password: faker.random.alphaNumeric(10)
-};
+const user1 = generateRandomUser();
+const user2 = generateRandomUser();
+const { username, password, email } = generateRandomUser();
 
 describe('Authentication', () => {
   const tokenPayload = {};
@@ -63,7 +56,6 @@ describe('Authentication', () => {
           expect(res).to.have.status(409);
           expect(res.body.errors).to.be.an('Array');
           expect(res.body.errors[0]).to.contain('already exists');
-          expect(res.body);
           done(err);
         });
     });
@@ -77,7 +69,6 @@ describe('Authentication', () => {
           expect(res).to.have.status(409);
           expect(res.body.errors).to.be.an('Array');
           expect(res.body.errors[0]).to.contain('already exists');
-          expect(res.body);
           done(err);
         });
     });
@@ -87,15 +78,14 @@ describe('Authentication', () => {
         .request(server)
         .post(baseUrl)
         .send({
-          username: faker.internet.userName(),
+          username,
           email: 'invalid email',
-          password: 'jakejake'
+          password
         })
         .end((err, res) => {
           expect(res).to.have.status(400);
           expect(res.body.errors).to.be.an('object');
           expect(res.body.errors).to.haveOwnProperty('email');
-          expect(res.body);
           done(err);
         });
     });
@@ -105,15 +95,14 @@ describe('Authentication', () => {
         .request(server)
         .post(baseUrl)
         .send({
-          username: faker.internet.userName(),
-          email: faker.internet.email(),
+          username,
+          email,
           password: 'short'
         })
         .end((err, res) => {
           expect(res).to.have.status(400);
           expect(res.body.errors).to.be.an('object');
           expect(res.body.errors).to.haveOwnProperty('password');
-          expect(res.body);
           done(err);
         });
     });
@@ -123,15 +112,14 @@ describe('Authentication', () => {
         .request(server)
         .post(baseUrl)
         .send({
-          username: faker.internet.userName(),
-          email: faker.internet.email(),
+          username,
+          email,
           password: '!&@*@(@)!)!'
         })
         .end((err, res) => {
           expect(res).to.have.status(400);
           expect(res.body.errors).to.be.an('object');
           expect(res.body.errors).to.haveOwnProperty('password');
-          expect(res.body);
           done(err);
         });
     });
@@ -270,11 +258,10 @@ describe('User', () => {
   let loggedInUser;
 
   before(() => {
-    const { email, password } = user1;
     return chai
       .request(server)
       .post('/api/users/login')
-      .send({ email, password })
+      .send({ email: user1.email, password: user1.password })
       .then(res => {
         loggedInUser = res.body.user;
       });
@@ -417,10 +404,9 @@ describe('User', () => {
   });
 
   it('should get profile of a specific user', done => {
-    const { username } = user2;
     chai
       .request(server)
-      .get(`/api/profiles/${username}`)
+      .get(`/api/profiles/${user2.username}`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         const { user } = res.body;
@@ -435,10 +421,9 @@ describe('User', () => {
   });
 
   it('should return an error if profile is not found', done => {
-    const username = faker.random.alphaNumeric(10);
     chai
       .request(server)
-      .get(`/api/profiles/${username}`)
+      .get(`/api/profiles/andela`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         expect(res).to.have.status(404);
@@ -532,10 +517,9 @@ describe('User', () => {
   });
 
   it('should follow a user', done => {
-    const { username } = user2;
     chai
       .request(server)
-      .post(`/api/profiles/${username}/follow`)
+      .post(`/api/profiles/${user2.username}/follow`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         expect(res).to.have.status(200);
@@ -544,10 +528,9 @@ describe('User', () => {
   });
 
   it('should return an error is user has already followed a particular user', done => {
-    const { username } = user2;
     chai
       .request(server)
-      .post(`/api/profiles/${username}/follow`)
+      .post(`/api/profiles/${user2.username}/follow`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         expect(res).to.have.status(400);
@@ -556,10 +539,9 @@ describe('User', () => {
   });
 
   it('should return an error is username is current user', done => {
-    const { username } = user1;
     chai
       .request(server)
-      .post(`/api/profiles/${username}/follow`)
+      .post(`/api/profiles/${user1.username}/follow`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         expect(res).to.have.status(400);
@@ -579,10 +561,9 @@ describe('User', () => {
   });
 
   it('should unfollow a user', done => {
-    const { username } = user2;
     chai
       .request(server)
-      .delete(`/api/profiles/${username}/follow`)
+      .delete(`/api/profiles/${user2.username}/follow`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         expect(res).to.have.status(200);
@@ -591,10 +572,9 @@ describe('User', () => {
   });
 
   it('should return an error if user try to unfollow themself', done => {
-    const { username } = user1;
     chai
       .request(server)
-      .delete(`/api/profiles/${username}/follow`)
+      .delete(`/api/profiles/${user1.username}/follow`)
       .set({ authorization: loggedInUser.token })
       .end((err, res) => {
         expect(res).to.have.status(500);