Merge pull request #281 from Turbo87/test-loader

Replace automatic test start via timeout with explicit `start()` call

addon-test-support/ember-mocha/index.js

@@ -1,3 +1,8 @@
+/* globals mocha */
+
+export { loadTests } from './test-loader';
+
+import { loadTests } from './test-loader';
 import describeModule       from 'ember-mocha/describe-module';
 import describeComponent    from 'ember-mocha/describe-component';
 import describeModel        from 'ember-mocha/describe-model';
@@ -28,6 +33,31 @@ function setupTest(moduleName) {
   return setupTestNew(...arguments);
 }
 
+/**
+ * Instruct Mocha to start the tests.
+ */
+export function startTests() {
+  mocha.run();
+}
+
+
+/**
+ * @method start
+ * @param {Object} [options] Options to be used for enabling/disabling behaviors
+ * @param {Boolean} [options.loadTests] If `false` tests will not be loaded automatically.
+ * @param {Boolean} [options.startTests] If `false` tests will not be automatically started
+ * (you must run `startTests()` to kick them off).
+ */
+export function start(options = {}) {
+  if (options.loadTests !== false) {
+    loadTests();
+  }
+
+  if (options.startTests !== false) {
+    startTests();
+  }
+}
+
 export {
   describeModule,
   describeComponent,

addon-test-support/ember-mocha/test-loader.js

@@ -0,0 +1,33 @@
+import { describe, it } from 'mocha';
+import AbstractTestLoader, {
+  addModuleIncludeMatcher,
+} from 'ember-cli-test-loader/test-support/index';
+
+addModuleIncludeMatcher(function(moduleName) {
+  return moduleName.match(/\.jshint$/);
+});
+
+export class TestLoader extends AbstractTestLoader {
+  shouldLoadModule(moduleName) {
+    return !moduleName.match(/^ember-mocha\//)
+      && (moduleName.match(/[-_]test$/) || moduleName.match(/\.jshint$/));
+  }
+
+  moduleLoadFailure(moduleName, error) {
+    describe('TestLoader Failures', function() {
+      it(moduleName + ': could not be loaded', function() {
+        throw error;
+      });
+    });
+  }
+}
+
+/**
+ * Load tests following the default patterns:
+ *
+ * - The module name ends with `-test` or `_test`
+ * - The module name ends with `.jshint`
+ */
+export function loadTests() {
+  new TestLoader().loadModules();
+}

blueprints/ember-mocha/files/tests/test-helper.js

@@ -1,5 +1,8 @@
 import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-mocha';
 
 setApplication(Application.create(config.APP));
+
+start();

index.js

@@ -38,7 +38,6 @@ module.exports = {
     this.import('vendor/mocha/mocha.css', { type: 'test' });
     this.import('vendor/ember-mocha/mocha-configuration.js', { type: 'test' });
     this.import('vendor/ember-mocha/ember-mocha-adapter.js', { type: 'test' });
-    this.import('vendor/ember-mocha/test-loader.js', { type: 'test' });
 
     let addonOptions = this.targetOptions();
     let explicitlyDisabledStyles = addonOptions.disableContainerStyles === true;

tests/test-helper.js

@@ -1,4 +1,6 @@
-import { setResolver } from 'ember-mocha';
+import { setResolver, start } from 'ember-mocha';
 import resolver from './helpers/resolver';
 
 setResolver(resolver);
+
+start();