Merge pull request #5416 from jaswilli/fixup-test

Make sure done() is called from before hooks

core/test/functional/module/module_spec.js

@@ -13,9 +13,7 @@ describe('Module', function () {
                 should.exist(ghostServer);
 
                 done();
-            }).catch(function (e) {
+            }).catch(done);
-                done(e);
-            });
         });
 
         it('should expose an express instance', function (done) {
@@ -24,9 +22,7 @@ describe('Module', function () {
                 should.exist(ghostServer.rootApp);
 
                 done();
-            }).catch(function (e) {
+            }).catch(done);
-                done(e);
-            });
         });
 
         it('should expose configuration values', function (done) {
@@ -39,9 +35,7 @@ describe('Module', function () {
                 should.equal(ghostServer.config.paths.subdir, '');
 
                 done();
-            }).catch(function (e) {
+            }).catch(done);
-                done(e);
-            });
         });
 
         it('should have start/stop/restart functions', function (done) {
@@ -52,9 +46,7 @@ describe('Module', function () {
                 ghostServer.stop.should.be.a.Function;
 
                 done();
-            }).catch(function (e) {
+            }).catch(done);
-                done(e);
-            });
         });
     });
 });

core/test/functional/routes/api/authentication_spec.js

@@ -20,10 +20,7 @@ describe('Authentication API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/db_spec.js

@@ -19,10 +19,7 @@ describe('DB API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/error_spec.js

@@ -18,7 +18,7 @@ describe('Unauthorized', function () {
             request = supertest.agent(ghostServer.rootApp);
 
             done();
-        });
+        }).catch(done);
     });
 
     after(function (done) {

core/test/functional/routes/api/notifications_spec.js

@@ -20,10 +20,7 @@ describe('Notifications API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/posts_spec.js

@@ -22,10 +22,7 @@ describe('Post API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/settings_spec.js

@@ -21,10 +21,7 @@ describe('Settings API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/slugs_spec.js

@@ -21,10 +21,7 @@ describe('Slug API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/tags_spec.js

@@ -21,10 +21,7 @@ describe('Tag API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {

core/test/functional/routes/api/users_spec.js

@@ -21,10 +21,7 @@ describe('User API', function () {
         }).then(function (token) {
             accesstoken = token;
             done();
-        }).catch(function (e) {
+        }).catch(done);
-            console.log('Ghost Error: ', e);
-            console.log(e.stack);
-        });
     });
 
     after(function (done) {