Merge pull request #145 from ember-cli/rwjblue-patch-1

Prevent calling `QUnit.start` twice with jQuery 3.0.
ember-cli · Sep 11, 2016 · f0304d4 · f0304d4
2 parents 30a3f96 + cfd20e5
commit f0304d4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/vendor/ember-cli-qunit/test-loader.js b/vendor/ember-cli-qunit/test-loader.js
@@ -13,6 +13,9 @@
       document.addEventListener('DOMContentLoaded', fn);
     }
   }
+
+  var autostart = QUnit.config.autostart !== false;
+  QUnit.config.autostart = false;
 
   ready(function() {
     var QUnitAdapter = require('ember-qunit').QUnitAdapter;
@@ -64,9 +67,6 @@
       }
     });
 
-    var autostart = QUnit.config.autostart !== false;
-    QUnit.config.autostart = false;
-
     setTimeout(function() {
       TestLoader.load();