[feature #165412917] Refactor validation to remove similar codes

andela · May 3, 2019 · 8d357be · 8d357be
1 parent 8727aa1
commit 8d357be
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 13 deletions.
diff --git a/src/middlewares/validations/articles.js b/src/middlewares/validations/articles.js
@@ -15,10 +15,10 @@ class articles {
    */
   static create(req, res, next) {
     const result = validate.createArticle(req.body);
-    if (!result.error) {
-      return next();
+    if (result.error) {
+      return Error.joiErrorHandler(res, result);
     }
-    Error.joiErrorHandler(res, result);
+    return next();
   }
 
   /**
@@ -29,10 +29,7 @@ class articles {
    */
   static update(req, res, next) {
     const result = validate.updateArticle(req.body);
-    if (!result.error) {
-      return next();
-    }
-    Error.joiErrorHandler(res, result);
+    return result.error ? Error.joiErrorHandler(res, result) : next();
   }
 
   /**

diff --git a/src/tests/articles.js b/src/tests/articles.js
@@ -173,7 +173,7 @@ describe('Article', () => {
         });
     });
   });
-  describe('Get all article', () => {
+  describe('Get articles', () => {
     it('Should get all articles', async () => {
       const token = 'token-string';
       chai
@@ -193,6 +193,24 @@ describe('Article', () => {
           response.articles[0].coverUrl.should.be.a('string');
         });
     });
+    it('Should get one article', async () => {
+      const token = 'token-string';
+      chai
+        .request(app)
+        .get('/api/articles/going-home-like-a-dog-2aijv735e7w')
+        .set('Authorization', `Bearer ${token}`)
+        .end((err, res) => {
+          const response = res.body;
+          expect(res).to.have.status(status.OK);
+          response.article.should.be.a('object');
+          response.article.id.should.be.a('number');
+          response.article.title.should.be.a('string');
+          response.article.body.should.be.a('string');
+          response.article.description.should.be.a('string');
+          response.article.slug.should.be.a('string');
+          response.article.coverUrl.should.be.a('string');
+        });
+    });
   });
   describe('Update article', () => {
     it('Should update the article', async () => {
@@ -216,8 +234,6 @@ describe('Article', () => {
           expect(res).to.have.status(status.CREATED);
         });
     });
-  });
-  describe('Publish article', () => {
     it('Should publish article', async () => {
       const token = 'token-string';
       chai
@@ -230,6 +246,56 @@ describe('Article', () => {
         });
     });
   });
+  describe('Publish article', () => {
+    it('Should not publish a non existing article', async () => {
+      const token = 'token-string';
+      chai
+        .request(app)
+        .put('/api/articles/invalid-1632jv5quc9c/publish')
+        .set('Authorization', `Bearer ${token}`)
+        .end((err, res) => {
+          expect(res).to.have.status(status.NOT_FOUND);
+          // response.should.be.a('objenpm ct');
+        });
+    });
+    it('Should publish an article', async () => {
+      const token = 'token-string';
+      chai
+        .request(app)
+        .put('/api/articles/going-home-like-a-dog-2aijv735e7w/publish')
+        .set('Authorization', `Bearer ${token}`)
+        .end((err, res) => {
+          expect(res).to.have.status(status.OK);
+          res.body.should.be.a('object');
+          res.body.message.should.equal('Article published successfully');
+        });
+    });
+  });
+  describe('Unpublish article', () => {
+    it('Should not unpublish a non existing article', async () => {
+      const token = 'token-string';
+      chai
+        .request(app)
+        .put('/api/articles/invalid-1632jv5quc9c/unpublish')
+        .set('Authorization', `Bearer ${token}`)
+        .end((err, res) => {
+          expect(res).to.have.status(status.NOT_FOUND);
+          res.body.should.be.a('object');
+        });
+    });
+    it('Should unpublish an article', async () => {
+      const token = 'token-string';
+      chai
+        .request(app)
+        .put('/api/articles/going-home-like-a-dog-2aijv735e7w/unpublish')
+        .set('Authorization', `Bearer ${token}`)
+        .end((err, res) => {
+          expect(res).to.have.status(status.OK);
+          res.body.should.be.a('object');
+          res.body.message.should.equal('Article unpublished successfully');
+        });
+    });
+  });
   describe('Delete article', () => {
     it('Should not delete a non existing article', async () => {
       const token = 'token-string';
@@ -252,10 +318,8 @@ describe('Article', () => {
           // const response = res.body;
           expect(res).to.have.status(status.OK);
           res.body.should.be.a('object');
+          res.body.message.should.equal('Article deleted successfully');
         });
     });
   });
-  // after(async () => {
-  //   db.Article.destroy({ truncate: true, cascade: true, logging: false });
-  // });
 });