From 3560fed86e148f2eb9f01c94903497a2ab97a6d4 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Wed, 4 Sep 2013 21:58:34 -0500
Subject: [PATCH] Fix test runner with phantomjs and dojo loader.

---
 test/index.html                 | 6 +++---
 test/test.js                    | 2 --
 vendor/qunit-clib/qunit-clib.js | 8 +++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/index.html b/test/index.html
index 5669b119b..4378d2790 100644
--- 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
index 51e957e15..8c94befbc 100644
--- 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
index 39f0832b9..df7025538 100644
--- 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();
+    }
   }
 
   /*--------------------------------------------------------------------------*/