Returned promises in mocha tests.

Author: neogeek

test/specs/doxdox.js

@@ -9,35 +9,29 @@ describe('doxdox', () => {
 
     describe('parseInput', () => {
 
-        it('parses input from file', done => {
-
-            doxdox.parseInput('./lib/doxdox.js', {'parser': 'dox'}).then(() => {
-
-                done();
-
-            });
-
-        });
+        it('parses input from file', () =>
+            doxdox.parseInput('./lib/doxdox.js', {'parser': 'dox'}));
 
     });
 
-    describe('parseInput', () => {
+    describe('parseInput (with mock-fs)', () => {
 
         before(() => {
 
             mock();
 
         });
 
-        it('fails to parse input from invalid file', done => {
-
+        it('fails to parse input from invalid file', () =>
             doxdox.parseInput('', {'parser': 'dox'}).catch(err => {
 
-                done();
+                if (err) {
 
-            });
+                    console.log(err);
 
-        });
+                }
+
+            }));
 
         after(() => {
 
@@ -49,8 +43,7 @@ describe('doxdox', () => {
 
     describe('parseInputs', () => {
 
-        it('parses multiple input from array', done => {
-
+        it('parses multiple input from array', () =>
             doxdox.parseInputs(['./lib/doxdox.js'], {
                 'description': '',
                 'layout': 'markdown',
@@ -60,11 +53,7 @@ describe('doxdox', () => {
 
                 assert.equal(content, fs.readFileSync('./test/fixtures/doxdox.md', 'utf8'));
 
-                done();
-
-            });
-
-        });
+            }));
 
     });
 

test/specs/loaders.js

@@ -4,69 +4,49 @@ describe('loaders', () => {
 
     describe('loadParser', () => {
 
-        it('loads dox parser', done => {
+        it('loads dox parser', () => loaders.loadParser({'parser': 'dox'}));
 
-            loaders.loadParser({'parser': 'dox'}).then(() => {
+        it('fails on invalid parser', () =>
+            loaders.loadParser({'parser': 'invalid'}).catch(err => {
 
-                done();
+                if (err) {
 
-            });
+                    console.log(err);
 
-        });
+                }
 
-        it('fails on invalid parser', done => {
-
-            loaders.loadParser({'parser': 'invalid'}).catch(() => {
-
-                done();
-
-            });
-
-        });
+            }));
 
     });
 
     describe('loadPlugin', () => {
 
-        it('loads markdown plugin', done => {
-
-            loaders.loadPlugin({'layout': 'markdown'}).then(() => {
-
-                done();
-
-            });
-
-        });
-
-        it('loads custom handlebars plugin when file is specified', done => {
-
-            loaders.loadPlugin({'layout': './test/fixtures/template.hbs'}).then(() => {
-
-                done();
-
-            });
+        it('loads markdown plugin', () => loaders.loadPlugin({'layout': 'markdown'}));
 
-        });
+        it('loads custom handlebars plugin when file is specified', () =>
+            loaders.loadPlugin({'layout': './test/fixtures/template.hbs'}));
 
-        it('fails on invalid plugin', done => {
+        it('fails on invalid plugin', () =>
+            loaders.loadPlugin({'layout': 'invalid'}).catch(err => {
 
-            loaders.loadPlugin({'layout': 'invalid'}).catch(() => {
+                if (err) {
 
-                done();
+                    console.log(err);
 
-            });
+                }
 
-        });
+            }));
 
-        it('fails on invalid custom template', done => {
+        it('fails on invalid custom template', () =>
+            loaders.loadPlugin({'layout': './test/fixtures/template.html'}).catch(err => {
 
-            loaders.loadPlugin({'layout': './test/fixtures/template.html'}).catch(() => {
+                if (err) {
 
-                done();
+                    console.log(err);
 
-            });
+                }
 
-        });
+            }));
 
     });