Fix test runner with phantomjs and dojo loader.

jdalton · jdalton · commit 3560fed86e14 · 2013-09-05T00:19:58.000-05:00
diff --git a/test/index.html b/test/index.html
@@ -36,9 +36,9 @@
 			document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>');
 
 			// load test.js if not using require.js
-			document.write(ui.urlParams.loader != 'none'
-				? '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>'
-				: '<script src="test.js"><\/script>'
+			document.write(ui.urlParams.loader == 'none'
+				? '<script src="test.js"><\/script>'
+				: '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>'
 			);
 		</script>
 		<script>
diff --git a/test/test.js b/test/test.js
@@ -4656,8 +4656,6 @@
 
   /*--------------------------------------------------------------------------*/
 
-  // configure QUnit and call `QUnit.start()` for
-  // Narwhal, Node.js, PhantomJS, Rhino, and RingoJS
   if (!document) {
     QUnit.config.noglobals = true;
     QUnit.start();
diff --git a/vendor/qunit-clib/qunit-clib.js b/vendor/qunit-clib/qunit-clib.js
@@ -276,9 +276,11 @@
       context[methodName] = QUnit[methodName];
     });
 
-    // must call `QUnit.start()` in the test file if using QUnit < 1.3.0 with
-    // Node.js or any version of QUnit with Narwhal, PhantomJS, Rhino, or RingoJS
-    QUnit.init();
+    // must call `QUnit.start()` in the test file if not loaded in a browser
+    if (!context.document || context.phantom) {
+      QUnit.config.autostart = false;
+      QUnit.init();
+    }
   }
 
   /*--------------------------------------------------------------------------*/
