From d36d116d360bbe54b7700b95185a6eb2069ed637 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 31 Jan 2013 10:19:48 -0500
Subject: Upgrade QUnit to 1.11.0. Fixes #8969 - Global test failure in Opera
 12.12.

---
 tests/unit/qunit-composite.css | 24 ++++++++++++------------
 tests/unit/qunit-composite.js  | 12 +++++++++++-
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/qunit-composite.css b/tests/unit/qunit-composite.css
index df47362db..c530436da 100644
--- a/tests/unit/qunit-composite.css
+++ b/tests/unit/qunit-composite.css
@@ -1,13 +1,13 @@
-iframe.qunit-subsuite{
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    
-    margin: 0;
-    padding: 0;
-    border-width: 1px 0 0;
-    height: 45%;
-    width: 100%;
+iframe.qunit-subsuite {
+	position: fixed;
+	bottom: 0;
+	left: 0;
 
-    background: #fff;
-}
\ No newline at end of file
+	margin: 0;
+	padding: 0;
+	border-width: 1px 0 0;
+	height: 45%;
+	width: 100%;
+
+	background: #fff;
+}
diff --git a/tests/unit/qunit-composite.js b/tests/unit/qunit-composite.js
index b3df04217..2e5454056 100644
--- a/tests/unit/qunit-composite.js
+++ b/tests/unit/qunit-composite.js
@@ -16,8 +16,15 @@ QUnit.extend( QUnit, {
 	},
 
 	runSuite: function( suite ) {
+		var path = suite;
+
+		if ( QUnit.is( "object", suite ) ) {
+			path = suite.path;
+			suite = suite.name;
+		}
+
 		asyncTest( suite, function() {
-			QUnit.iframe.setAttribute( "src", suite );
+			QUnit.iframe.setAttribute( "src", path );
 		});
 	},
 
@@ -33,6 +40,9 @@ QUnit.extend( QUnit, {
 			var module, test,
 				count = 0;
 
+			if (iframe.src === "") {
+				return;
+			}
 
 			iframeWin.QUnit.moduleStart(function( data ) {
 				// capture module name for messages
-- 
cgit v1.2.3