Merge branch 'staging' into chore/164859311/update-readme

andela · Mar 27, 2019 · 327ef49 · 327ef49
2 parents 1d9ccd4 + 75816e0
commit 327ef49
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/.env.example b/.env.example
@@ -26,10 +26,7 @@ GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
 GOOGLE_CALLBACK_URL=
 
-JWT_TOKEN=
-
 # sessions details
 COOKIE_SECRET=
 
-
 API_DOMAIN=localhost:3000
diff --git a/test/integrations/routes/reportArticle.test.js b/test/integrations/routes/reportArticle.test.js
@@ -1,19 +1,30 @@
 import chai, { expect } from 'chai';
 import chaiHttp from 'chai-http';
 import app from '../../../index';
+import models from '../../../models';
+import { auth } from '../../helpers';
 
 chai.use(chaiHttp);
 
 describe('Report Article API endpoint', () => {
-  const token = process.env.JWT_TOKEN;
+  let authToken;
+
+  before(async () => {
+    const user = await models.User.findByPk(2, { raw: true });
+    user.password = 'secret';
+    const response = await auth(user);
+    authToken = response.body.token;
+  });
+
+  // const token = process.env.JWT_TOKEN;
   describe('/reporting article Post Endpoint', () => {
     it('should report an article with report-type of "spam"', async () => {
       const reportArticle = {
         reportType: 'spam',
       };
       const res = await chai.request(app)
         .post('/api/v1/articles/2/report')
-        .set({ Authorization: `Bearer ${token}` })
+        .set({ Authorization: `Bearer ${authToken}` })
         .send(reportArticle);
       expect(res.body.code).to.equal(201);
       expect(res.body.data).to.be.an('object');
@@ -27,7 +38,7 @@ describe('Report Article API endpoint', () => {
       };
       const res = await chai.request(app)
         .post('/api/v1/articles/3/report')
-        .set({ Authorization: `Bearer ${token}` })
+        .set({ Authorization: `Bearer ${authToken}` })
         .send(reportArticle);
       expect(res.body.code).to.equal(201);
       expect(res.body.data).to.be.an('object');
@@ -41,7 +52,7 @@ describe('Report Article API endpoint', () => {
       };
       const res = await chai.request(app)
         .post('/api/v1/articles/2/report')
-        .set({ Authorization: `Bearer ${token}` })
+        .set({ Authorization: `Bearer ${authToken}` })
         .send(reportArticle);
       expect(res.body.code).to.equal(400);
       expect(res.body.data).to.be.an('array');
@@ -55,7 +66,7 @@ describe('Report Article API endpoint', () => {
       };
       const res = await chai.request(app)
         .post('/api/v1/articles/2/report')
-        .set({ Authorization: `Bearer ${token}` })
+        .set({ Authorization: `Bearer ${authToken}` })
         .send(reportArticle);
       expect(res.body.code).to.equal(403);
       expect(res.body.data).to.be.an('object');
@@ -69,7 +80,7 @@ describe('Report Article API endpoint', () => {
       };
       const res = await chai.request(app)
         .post('/api/v1/articles/2/report')
-        .set({ Authorization: `Bearer ${token}` })
+        .set({ Authorization: `Bearer ${authToken}` })
         .send(reportArticle);
       expect(res.body.code).to.equal(400);
       expect(res.body.data).to.be.an('array');
@@ -83,7 +94,7 @@ describe('Report Article API endpoint', () => {
       };
       const res = await chai.request(app)
         .post('/api/v1/articles/4/report')
-        .set({ Authorization: `Bearer ${token}` })
+        .set({ Authorization: `Bearer ${authToken}` })
         .send(reportArticle);
       expect(res.body.code).to.equal(201);
       expect(res.body.data).to.be.an('object');
@@ -96,7 +107,7 @@ describe('Report Article API endpoint', () => {
     it('should get a reported article', async () => {
       const res = await chai.request(app)
         .get('/api/v1/articles/2/report')
-        .set({ Authorization: `Bearer ${token}` });
+        .set({ Authorization: `Bearer ${authToken}` });
       expect(res.body.code).to.equal(200);
       expect(res.body.message).to.equal('success');
       expect(res.body.status).to.equal(true);
@@ -105,7 +116,7 @@ describe('Report Article API endpoint', () => {
     it('should return error for non-existing article', async () => {
       const res = await chai.request(app)
         .get('/api/v1/articles/b/report')
-        .set({ Authorization: `Bearer ${token}` });
+        .set({ Authorization: `Bearer ${authToken}` });
       expect(res.body.code).to.equal(404);
       expect(res.body.message).to.equal('ARTICLE NOT FOUND');
       expect(res.body.status).to.equal('Failure');

diff --git a/test/unit/middlewares/articlesMiddleware.test.js b/test/unit/middlewares/articlesMiddleware.test.js
@@ -18,13 +18,13 @@ let authpayload;
 let authpayload2;
 let articlePayload;
 
-let dummyUser = {
+const dummyUser = {
   email: faker.internet.email(),
   password: 'i2345678',
   username: 'error-test'
 };
 
-let dummyUser2 = {
+const dummyUser2 = {
   email: faker.internet.email(),
   password: 'p98765435667',
   username: 'murderer-inc'
@@ -42,7 +42,7 @@ const dummyArticle = {
 const createUser = async () => {
   try {
     const user = await models.User.create(dummyUser);
-    dummyUser = user;
+    dummyUser.id = user.id;
     return dummyUser;
   } catch (error) {
     return error;
@@ -52,7 +52,7 @@ const createUser = async () => {
 const createUser2 = async () => {
   try {
     const user = await models.User.create(dummyUser2);
-    dummyUser2 = user;
+    dummyUser2.id = user.id;
     return dummyUser2;
   } catch (error) {
     return error;
@@ -61,14 +61,13 @@ const createUser2 = async () => {
 
 describe('API endpoint: /api/articles (Middleware test)', () => {
   before(async () => {
-    models.sequelize.sync();
-    createUser();
+    await createUser();
     authpayload = await chai.request(app)
       .post('/api/v1/users/login')
       .send(dummyUser);
     dummyUser.token = authpayload.body.token;
 
-    createUser2();
+    await createUser2();
     authpayload2 = await chai.request(app)
       .post('/api/v1/users/login')
       .send(dummyUser2);
@@ -85,7 +84,6 @@ describe('API endpoint: /api/articles (Middleware test)', () => {
       .set({ Authorization: `Bearer ${dummyUser2.token}` });
 
     dummyArticle2 = articlePayload.body.data;
-    // return dummyUser;
   });
 
   describe('POST: /api/v1/articles', () => {