Update loading models for mocha testing

Trustroots · Oct 29, 2018 · 133de5c · 133de5c
1 parent 29a380d
commit 133de5c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 22 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -419,30 +419,28 @@ function mocha(done) {
   mongooseService.connect(function (db) {
     // Clean out test database to have clean base
     mongooseService.dropDatabase(db, function () {
-      mongooseService.loadModels(function () {
-        // Run the tests
-        gulp.src(testSuites)
-          .pipe(plugins.mocha({
-            reporter: 'spec',
-            timeout: 10000
-          }))
-          .on('error', function (err) {
-            // If an error occurs, save it
-            error = err;
-            console.error(err);
-          })
-          .on('end', function () {
-            // When the tests are done, disconnect agenda/mongoose
-            // and pass the error state back to gulp
-            // @TODO: https://github.com/Trustroots/trustroots/issues/438
-            // @link https://github.com/agenda/agenda/pull/450
-            agenda._mdb.close(function () {
-              mongooseService.disconnect(function () {
-                done(error);
-              });
+      gulp.src(testSuites)
+        .pipe(plugins.mocha({
+          reporter: 'spec',
+          timeout: 10000,
+          file: './testutils/loadmodels.testutil'
+        }))
+        .on('error', function (err) {
+          // If an error occurs, save it
+          error = err;
+          console.error(err);
+        })
+        .on('end', function () {
+          // When the tests are done, disconnect agenda/mongoose
+          // and pass the error state back to gulp
+          // @TODO: https://github.com/Trustroots/trustroots/issues/438
+          // @link https://github.com/agenda/agenda/pull/450
+          agenda._mdb.close(function () {
+            mongooseService.disconnect(function () {
+              done(error);
             });
           });
-      });
+        });
     });
   });
 }

diff --git a/testutils/loadmodels.testutil.js b/testutils/loadmodels.testutil.js
@@ -0,0 +1,13 @@
+var mongooseService = require('../config/lib/mongoose');
+
+var loadModelsDone = new Promise(function (resolve) {
+  mongooseService.loadModels(function () {
+    resolve(true);
+  });
+});
+
+loadModelsDone.then(
+  function (resolved) {
+    return resolved;
+  }
+);