Merge pull request #39 from rwjblue/add-async-before-starting-test

Add a short delay before starting tests.
ember-cli · Feb 4, 2015 · 6e7fa32 · 6e7fa32
2 parents 916453f + 5434b98
commit 6e7fa32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/vendor/ember-cli-qunit/qunit-configuration.js b/vendor/ember-cli-qunit/qunit-configuration.js
@@ -1,5 +1,6 @@
 /* globals jQuery,QUnit */
 
+QUnit.config.autostart = false;
 QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
 QUnit.config.urlConfig.push({ id: 'nojshint', label: 'Disable JSHint'});
 

diff --git a/vendor/ember-cli-qunit/test-loader.js b/vendor/ember-cli-qunit/test-loader.js
@@ -5,5 +5,9 @@ jQuery(document).ready(function() {
   TestLoader.prototype.shouldLoadModule = function(moduleName) {
     return moduleName.match(/[-_]test$/) || (!QUnit.urlParams.nojshint && moduleName.match(/\.jshint$/));
   };
-  TestLoader.load();
+
+  setTimeout(function() {
+    TestLoader.load();
+    QUnit.start();
+  }, 250);
 });