#156100323 arrange tests and add more tests

app/controllers/users.js

@@ -164,7 +164,7 @@ const searchFriend = (req, res) => {
         if (!friend) {
           return res.status(200).send({ message: 'No friends found' });
         }
-        if (friend._id == req.decoded._id) {
+        if (friend._id == req.decoded.payload._id) {
           return res.status(200)
             .send({ message: 'You cannot search for yourself' });
         }
@@ -183,7 +183,7 @@ const searchFriend = (req, res) => {
         if (!friend) {
           return res.status(200).send({ message: 'No friends found' });
         }
-        if (friend._id == req.decoded._id) {
+        if (friend._id == req.decoded.payload._id) {
           return res.status(200)
             .send({ message: 'You cannot search for yourself' });
         }
@@ -219,7 +219,7 @@ const inviteUserByEmail = (req, res) => {
 
   transporter.sendMail(mailOptions, (err, info) => {
     if (err) {
-      return res.status(500).send({ error: 'an error occurred' });
+      return res.status(500).send({ error: 'an error occured' });
     }
     return res.status(200).send({
       message: 'invite successfully sent',
@@ -344,7 +344,7 @@ exports.verifyToken = (req, res, next) => {
       next();
     });
   } else {
-    return res.status(403).send({ error: 'You have to login First' });
+    return res.status(401).send({ error: 'You have to login First' });
   }
 };
 

gulpfile.babel.js

@@ -64,7 +64,7 @@ gulp.task('dist-dep', [
 
 gulp.task('test', () => {
   gulp
-    .src(['test/**/*.js'])
+    .src(['test/user/*.js'])
     .pipe(mocha({
       reporter: 'spec',
       exit: true,
@@ -110,14 +110,3 @@ gulp.task('mv-config', () => move('config/env/*.json', './dist/config/env'));
 
 gulp.task('mv-public', () =>
   move(['public/**/*', '!public/js/**'], './dist/public'));
-
-gulp.task('test', () => {
-  gulp
-    .src(['test/**/*.js'])
-    .pipe(mocha({
-      reporter: 'spec',
-      exit: true,
-      compilers: 'babel-core/register'
-    }))
-    .pipe(exit());
-});

test/user/search_invite.js

@@ -0,0 +1,105 @@
+import supertest from 'supertest';
+import { expect } from 'chai';
+import mongoose from 'mongoose';
+import app from '../../dist/server';
+
+const request = supertest.agent(app);
+let firstUserToken;
+describe('POST /api/search/users', () => {
+  it('sign up a user first', (done) => {
+    request
+      .post('/api/auth/signup')
+      .set('Content-Type', 'application/json')
+      .send({
+        name: 'efosa',
+        email: 'test@yahoo.com',
+        password: 'test',
+        username: 'efosky',
+      })
+      .end((err, res) => {
+        expect(res.status).to.equal(201);
+        firstUserToken = res.body.token;
+        done();
+      });
+  });
+  const searchQuery = {
+    search: 'test@yahoo.com'
+  };
+  it('returns an error message if user is not authenticated', (done) => {
+    request
+      .post('/api/search/users')
+      .set('Content-Type', 'application/json')
+      .send(searchQuery)
+      .end((err, res) => {
+        expect(res.status).to.equal(401);
+        expect(res.body.error).to.equal('You have to login First');
+        done();
+      });
+  });
+  it('returns an error message if user searches for himself', (done) => {
+    request
+      .post('/api/search/users')
+      .set('x-access-token', firstUserToken)
+      .send(searchQuery)
+      .end((err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.body.message).to.equal('You cannot search for yourself');
+        done();
+      });
+  });
+  it('returns a message if no user is found', (done) => {
+    searchQuery.search = 'tester@jfhf.com';
+    request
+      .post('/api/search/users')
+      .set('x-access-token', firstUserToken)
+      .send(searchQuery)
+      .end((err, res) => {
+        expect(res.body.message).to.equal('No friends found');
+        done();
+      });
+  });
+  it('performs a search with username', (done) => {
+    searchQuery.search = 'efosky';
+    request
+      .post('/api/search/users')
+      .set('x-access-token', firstUserToken)
+      .send(searchQuery)
+      .end((err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.body.user.username).to.equal('efosky');
+        done();
+      });
+  });
+  it('performs a search with email', (done) => {
+    request
+      .post('/api/search/users')
+      .set('x-access-token', firstUserToken)
+      .send(searchQuery)
+      .end((err, res) => {
+        expect(res.status).to.equal(200);
+        expect(res.body.user.email).to.equal('test@yahoo.com');
+        done();
+      });
+  });
+});
+
+describe('POST /api/invite/users', () => {
+  const inviteReceipt = {
+    emailOfUsernameOfFriend: 'efosaokpugie@gmail.com',
+    link: 'localhost:3000/#!/app?game=83747mdbbf',
+  };
+  it('returns an error message if user is not authenticated', (done) => {
+    request
+      .post('/api/invite/users')
+      .send(inviteReceipt)
+      .end((err, res) => {
+        expect(res.status).to.equal(401);
+        done();
+      });
+  });
+});
+
+// mongoose.connection.db.dropDatabase();
+after((done) => {
+  mongoose.connection.db.dropDatabase(done);
+});

test/user/signup_signin.js

@@ -9,6 +9,7 @@ after((done) => {
   mongoose.connection.db.dropDatabase(done);
 });
 
+
 describe('POST api/auth/signup', () => {
   it('should not allow a user to sign up with no name', (done) => {
     request
@@ -79,40 +80,6 @@ describe('POST api/auth/signup', () => {
   });
 });
 
-describe('POST /api/search/users', () => {
-  const searchQuery = {
-    emailOrUsernameOfFriend: 'tester@test.com',
-  };
-  it('returns an error message if user is not authenticated', (done) => {
-    request
-      .post('/api/search/users')
-      .set('Content-Type', 'application/json')
-      .send(searchQuery)
-      .end((err, res) => {
-        expect(res.status).to.equal(403);
-        expect(res.body.error).to.equal('You have to login First');
-        done();
-      });
-  });
-});
-describe('POST /api/invite/users', () => {
-  const searchQuery = {
-    emailOrUsernameOfFriend: 'tester@test.com',
-    link: 'localhost:3000/#!/app?game=83747mdbbf',
-  };
-  it('returns an error message if user is not authenticated', (done) => {
-    request
-      .post('/api/invite/users')
-      .set('Content-Type', 'application/json')
-      .send(searchQuery)
-      .end((err, res) => {
-        expect(res.status).to.equal(403);
-        expect(res.body.error).to.equal('You have to login First');
-        done();
-      });
-  });
-});
-
 describe('POST api/auth/login', () => {
   it('should not allow a user to login with no email', (done) => {
     request