feat(articles): Promisifies article server test set up and clean up (#…

…1774) Promisifies object creation in beforeEach and afterEach hooks in article server tests. Fixes #1773
meanjs · Jun 12, 2017 · d72da37 · d72da37
1 parent c6215a0
commit d72da37
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 33 deletions.
diff --git a/modules/articles/tests/server/admin.article.server.routes.tests.js b/modules/articles/tests/server/admin.article.server.routes.tests.js
@@ -49,14 +49,16 @@ describe('Article Admin CRUD tests', function () {
     });
 
     // Save a user to the test db and create new article
-    user.save(function () {
-      article = {
-        title: 'Article Title',
-        content: 'Article Content'
-      };
-
-      done();
-    });
+    user.save()
+      .then(function () {
+        article = {
+          title: 'Article Title',
+          content: 'Article Content'
+        };
+
+        done();
+      })
+      .catch(done);
   });
 
   it('should be able to save an article if logged in', function (done) {
@@ -275,8 +277,9 @@ describe('Article Admin CRUD tests', function () {
   });
 
   afterEach(function (done) {
-    User.remove().exec(function () {
-      Article.remove().exec(done);
-    });
+    Article.remove().exec()
+      .then(User.remove().exec())
+      .then(done())
+      .catch(done);
   });
 });
diff --git a/modules/articles/tests/server/article.server.model.tests.js b/modules/articles/tests/server/article.server.model.tests.js
@@ -26,18 +26,21 @@ describe('Article Model Unit Tests:', function () {
       displayName: 'Full Name',
       email: 'test@test.com',
       username: 'username',
-      password: 'M3@n.jsI$Aw3$0m3'
+      password: 'M3@n.jsI$Aw3$0m3',
+      provider: 'local'
     });
 
-    user.save(function () {
-      article = new Article({
-        title: 'Article Title',
-        content: 'Article Content',
-        user: user
-      });
+    user.save()
+      .then(function () {
+        article = new Article({
+          title: 'Article Title',
+          content: 'Article Content',
+          user: user
+        });
 
-      done();
-    });
+        done();
+      })
+      .catch(done);
   });
 
   describe('Method Save', function () {
@@ -60,8 +63,9 @@ describe('Article Model Unit Tests:', function () {
   });
 
   afterEach(function (done) {
-    Article.remove().exec(function () {
-      User.remove().exec(done);
-    });
+    Article.remove().exec()
+      .then(User.remove().exec())
+      .then(done())
+      .catch(done);
   });
 });
diff --git a/modules/articles/tests/server/article.server.routes.tests.js b/modules/articles/tests/server/article.server.routes.tests.js
@@ -49,14 +49,16 @@ describe('Article CRUD tests', function () {
     });
 
     // Save a user to the test db and create new article
-    user.save(function () {
-      article = {
-        title: 'Article Title',
-        content: 'Article Content'
-      };
+    user.save()
+      .then(function () {
+        article = {
+          title: 'Article Title',
+          content: 'Article Content'
+        };
 
-      done();
-    });
+        done();
+      })
+      .catch(done);
   });
 
   it('should not be able to save an article if logged in without the "admin" role', function (done) {
@@ -407,8 +409,9 @@ describe('Article CRUD tests', function () {
   });
 
   afterEach(function (done) {
-    User.remove().exec(function () {
-      Article.remove().exec(done);
-    });
+    Article.remove().exec()
+      .then(User.remove().exec())
+      .then(done())
+      .catch(done);
   });
 });