Build: Upgrade QUnit to 1.14.0

(cherry-picked from 95b21c6e)

README.md

@@ -269,7 +269,7 @@ deepEqual( actual, expected, [message] );
 notDeepEqual( actual, expected, [message] );
 strictEqual( actual, expected, [message] );
 notStrictEqual( actual, expected, [message] );
-raises( block, [expected], [message] );
+throws( block, [expected], [message] );
 ```
 
 

bower.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "requirejs": "2.1.10",
-    "qunit": "1.12.0",
+    "qunit": "1.14.0",
     "sinon": "1.8.1"
   },
   "keywords": [

test/.jshintrc

@@ -36,7 +36,7 @@
 		"start": false,
 		"stop": false,
 		"expect": false,
-		"raises": false,
+		"throws": false,
 		"ajaxTest": false,
 		"testIframe": false,
 		"testIframeWithCallback": false,

test/libs/qunit/qunit.css

-/**
- * QUnit v1.12.0 - A JavaScript Unit Testing Framework
+/*!
+ * QUnit 1.14.0
+ * http://qunitjs.com/
  *
- * http://qunitjs.com
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license.
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license
  * http://jquery.org/license
+ *
+ * Date: 2014-01-31T16:40Z
  */
 
 /** Font Family and Sizes */
@@ -31,32 +32,29 @@
 #qunit-header {
 	padding: 0.5em 0 0.5em 1em;
 
-	color: #8699a4;
-	background-color: #0d3349;
+	color: #8699A4;
+	background-color: #0D3349;
 
 	font-size: 1.5em;
 	line-height: 1em;
-	font-weight: normal;
+	font-weight: 400;
 
 	border-radius: 5px 5px 0 0;
-	-moz-border-radius: 5px 5px 0 0;
-	-webkit-border-top-right-radius: 5px;
-	-webkit-border-top-left-radius: 5px;
 }
 
 #qunit-header a {
 	text-decoration: none;
-	color: #c2ccd1;
+	color: #C2CCD1;
 }
 
 #qunit-header a:hover,
 #qunit-header a:focus {
-	color: #fff;
+	color: #FFF;
 }
 
 #qunit-testrunner-toolbar label {
 	display: inline-block;
-	padding: 0 .5em 0 .1em;
+	padding: 0 0.5em 0 0.1em;
 }
 
 #qunit-banner {
@@ -66,14 +64,14 @@
 #qunit-testrunner-toolbar {
 	padding: 0.5em 0 0.5em 2em;
 	color: #5E740B;
-	background-color: #eee;
+	background-color: #EEE;
 	overflow: hidden;
 }
 
 #qunit-userAgent {
 	padding: 0.5em 0 0.5em 2.5em;
-	background-color: #2b81af;
-	color: #fff;
+	background-color: #2B81AF;
+	color: #FFF;
 	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
 }
 
@@ -89,7 +87,7 @@
 
 #qunit-tests li {
 	padding: 0.4em 0.5em 0.4em 2.5em;
-	border-bottom: 1px solid #fff;
+	border-bottom: 1px solid #FFF;
 	list-style-position: inside;
 }
 
@@ -103,7 +101,7 @@
 
 #qunit-tests li a {
 	padding: 0.5em;
-	color: #c2ccd1;
+	color: #C2CCD1;
 	text-decoration: none;
 }
 #qunit-tests li a:hover,
@@ -120,11 +118,9 @@
 	margin-top: 0.5em;
 	padding: 0.5em;
 
-	background-color: #fff;
+	background-color: #FFF;
 
 	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
 }
 
 .qunit-collapsed {
@@ -133,13 +129,13 @@
 
 #qunit-tests table {
 	border-collapse: collapse;
-	margin-top: .2em;
+	margin-top: 0.2em;
 }
 
 #qunit-tests th {
 	text-align: right;
 	vertical-align: top;
-	padding: 0 .5em 0 0;
+	padding: 0 0.5em 0 0;
 }
 
 #qunit-tests td {
@@ -153,26 +149,26 @@
 }
 
 #qunit-tests del {
-	background-color: #e0f2be;
-	color: #374e0c;
+	background-color: #E0F2BE;
+	color: #374E0C;
 	text-decoration: none;
 }
 
 #qunit-tests ins {
-	background-color: #ffcaca;
+	background-color: #FFCACA;
 	color: #500;
 	text-decoration: none;
 }
 
 /*** Test Counts */
 
-#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.counts                       { color: #000; }
 #qunit-tests b.passed                       { color: #5E740B; }
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
 	padding: 5px;
-	background-color: #fff;
+	background-color: #FFF;
 	border-bottom: none;
 	list-style-position: inside;
 }
@@ -180,8 +176,8 @@
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #3c510c;
-	background-color: #fff;
+	color: #3C510C;
+	background-color: #FFF;
 	border-left: 10px solid #C6E746;
 }
 
@@ -189,7 +185,7 @@
 #qunit-tests .pass .test-name               { color: #366097; }
 
 #qunit-tests .pass .test-actual,
-#qunit-tests .pass .test-expected           { color: #999999; }
+#qunit-tests .pass .test-expected           { color: #999; }
 
 #qunit-banner.qunit-pass                    { background-color: #C6E746; }
 
@@ -197,24 +193,21 @@
 
 #qunit-tests li li.fail {
 	color: #710909;
-	background-color: #fff;
+	background-color: #FFF;
 	border-left: 10px solid #EE5757;
 	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
 	border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	-webkit-border-bottom-right-radius: 5px;
-	-webkit-border-bottom-left-radius: 5px;
 }
 
-#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail                          { color: #000; background-color: #EE5757; }
 #qunit-tests .fail .test-name,
-#qunit-tests .fail .module-name             { color: #000000; }
+#qunit-tests .fail .module-name             { color: #000; }
 
 #qunit-tests .fail .test-actual             { color: #EE5757; }
-#qunit-tests .fail .test-expected           { color: green;   }
+#qunit-tests .fail .test-expected           { color: #008000; }
 
 #qunit-banner.qunit-fail                    { background-color: #EE5757; }
 
@@ -224,13 +217,13 @@
 #qunit-testresult {
 	padding: 0.5em 0.5em 0.5em 2.5em;
 
-	color: #2b81af;
+	color: #2B81AF;
 	background-color: #D2E0E6;
 
-	border-bottom: 1px solid white;
+	border-bottom: 1px solid #FFF;
 }
 #qunit-testresult .module-name {
-	font-weight: bold;
+	font-weight: 700;
 }
 
 /** Fixture */

test/unit/ajax.js

@@ -1453,7 +1453,7 @@ module( "ajax", {
 	});
 
 	test( "#11743 - jQuery.ajax() - script, throws exception", 1, function() {
-		raises(function() {
+		throws(function() {
 			jQuery.ajax({
 				url: "data/badjson.js",
 				dataType: "script",

test/unit/core.js

@@ -1310,7 +1310,7 @@ test("jQuery.parseHTML", function() {
 	equal( jQuery.parseHTML(), null, "Nothing in, null out." );
 	equal( jQuery.parseHTML( null ), null, "Null in, null out." );
 	equal( jQuery.parseHTML( "" ), null, "Empty string in, null out." );
-	raises(function() {
+	throws(function() {
 		jQuery.parseHTML( "<div></div>", document.getElementById("form") );
 	}, "Passing an element as the context raises an exception (context should be a document)");
 
@@ -1368,34 +1368,34 @@ test("jQuery.parseJSON", function() {
 	deepEqual( jQuery.parseJSON("\n{\"test\":1}\t"), { "test": 1 },
 		"Leading and trailing whitespace are ignored" );
 
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON();
 	}, null, "Undefined raises an error" );
-	raises( function() {
+	throws(function() {
 		jQuery.parseJSON( "" );
 	}, null, "Empty string raises an error" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("''");
 	}, null, "Single-quoted string raises an error" );
 	/*
 
 	// Broken on IE8
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("\" \\a \"");
 	}, null, "Invalid string escape raises an error" );
 
 	// Broken on IE8, Safari 5.1 Windows
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("\"\t\"");
 	}, null, "Unescaped control character raises an error" );
 
 	// Broken on IE8
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON(".123");
 	}, null, "Number with no integer component raises an error" );
 
 	*/
-	raises(function() {
+	throws(function() {
 		var result = jQuery.parseJSON("0101");
 
 		// Support: IE9+
@@ -1404,22 +1404,22 @@ test("jQuery.parseJSON", function() {
 			throw new Error("close enough");
 		}
 	}, null, "Leading-zero number raises an error or is parsed as decimal" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("{a:1}");
 	}, null, "Unquoted property raises an error" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("{'a':1}");
 	}, null, "Single-quoted property raises an error" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("[,]");
 	}, null, "Array element elision raises an error" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("{},[]");
 	}, null, "Comma expression raises an error" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("[]\n,{}");
 	}, null, "Newline-containing comma expression raises an error" );
-	raises(function() {
+	throws(function() {
 		jQuery.parseJSON("\"\"\n\"\"");
 	}, null, "Automatic semicolon insertion raises an error" );
 

test/unit/effects.js

@@ -1370,7 +1370,7 @@ test( "callbacks that throw exceptions will be removed (#5684)", function() {
 	jQuery.fx.stop();
 
 	this.clock.tick( 1 );
-	raises( jQuery.fx.tick, TestException, "Exception was thrown" );
+	throws( jQuery.fx.tick, TestException, "Exception was thrown" );
 
 	// the second call shouldn't
 	jQuery.fx.tick();

test/unit/manipulation.js

@@ -2252,13 +2252,13 @@ test( "html() - script exceptions bubble (#11743)", function() {
 
 	expect( 2 );
 
-	raises(function() {
+	throws(function() {
 		jQuery("#qunit-fixture").html("<script>undefined(); ok( false, 'Exception not thrown' );</script>");
 		ok( false, "Exception ignored" );
 	}, "Exception bubbled from inline script" );
 
 	if ( jQuery.ajax ) {
-		raises(function() {
+		throws(function() {
 			jQuery("#qunit-fixture").html("<script src='data/badcall.js'></script>");
 			ok( false, "Exception ignored" );
 		}, "Exception thrown in remote script" );