[fixup]: Upgrade grunt-contrib-qunit

Author: scottgonzalez

package.json

@@ -63,7 +63,7 @@
 		"grunt-contrib-concat": "0.1.3",
 		"grunt-contrib-csslint": "0.2.0",
 		"grunt-contrib-jshint": "0.7.1",
-		"grunt-contrib-qunit": "0.4.0",
+		"grunt-contrib-qunit": "0.6.0",
 		"grunt-contrib-uglify": "0.1.1",
 		"grunt-esformatter": "0.2.0",
 		"grunt-git-authors": "2.0.0",

tests/lib/bootstrap.js

@@ -6,6 +6,7 @@ window.requirejs = {
 		"jquery.simulate": "../../../external/jquery-simulate/jquery.simulate",
 		"jshint": "../../../external/jshint/jshint",
 		"lib": "../../lib",
+		"phantom-bridge": "../../../node_modules/grunt-contrib-qunit/phantomjs/bridge",
 		"qunit-assert-classes": "../../../external/qunit-assert-classes/qunit-assert-classes",
 		"qunit": "../../../external/qunit/qunit",
 		"ui": "../../../ui"
@@ -125,6 +126,12 @@ function swarmInject() {
 	script = document.createElement( "script" );
 	script.src = "../../../external/requirejs/require.js";
 	script.onload = function() {
+
+		// Create a dummy bridge if we're not actually testing in PhantomJS
+		if ( !/PhantomJS/.test( navigator.userAgent ) ) {
+			define( "phantom-bridge", function() {} );
+		}
+
 		requireTests( modules );
 	};
 	document.documentElement.appendChild( script );

tests/lib/qunit-bridge.js

@@ -1,8 +1,8 @@
 define( [
 	"qunit",
 	"jquery",
-	"./qunit-bridge",
-], function( QUnit, $, bridge ) {
+	"phantom-bridge"
+], function( QUnit, $ ) {
 
 QUnit.config.autostart = false;
 QUnit.config.requireExpects = true;
@@ -40,10 +40,6 @@ QUnit.reset = ( function( reset ) {
 	};
 } )( QUnit.reset );
 
-if ( /PhantomJS/.test( navigator.userAgent ) ) {
-	bridge();
-}
-
 return QUnit;
 
 } );