Build: Fork vendors to remove QUnit deprecated API usage

Changes:
* add `tests/lib/vendor/**/*` to `.eslintignore`
* move `qunit-composite` to `tests/lib` so that we can modify it
* move `qunit-assert-classes` to `tests/lib` so that we can modify it
* move `qunit-assert-close` to `tests/lib` so that we can modify it
* replace `assert.push` with `assert.pushResult`
* remove usage of `QUnit.extend`

Closes gh-2157

39 files changed, 241 insertions, 109 deletions

diff --git a/.eslintignore b/.eslintignore
index 8026d53f7..5e992599f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
 dist/**/*
 external/**/*
+tests/lib/vendor/**/*
 ui/vendor/**/*
diff --git a/Gruntfile.js b/Gruntfile.js
index 0471be52e..38d4fe199 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -272,18 +272,6 @@ grunt.initConfig( {
 				"qunit/qunit.css": "qunit/qunit/qunit.css",
 				"qunit/LICENSE.txt": "qunit/LICENSE.txt",
 
-				"qunit-assert-classes/qunit-assert-classes.js":
-					"qunit-assert-classes/qunit-assert-classes.js",
-				"qunit-assert-classes/LICENSE.txt": "qunit-assert-classes/LICENSE",
-
-				"qunit-assert-close/qunit-assert-close.js":
-					"qunit-assert-close/qunit-assert-close.js",
-				"qunit-assert-close/MIT-LICENSE.txt": "qunit-assert-close/MIT-LICENSE.txt",
-
-				"qunit-composite/qunit-composite.js": "qunit-composite/qunit-composite.js",
-				"qunit-composite/qunit-composite.css": "qunit-composite/qunit-composite.css",
-				"qunit-composite/LICENSE.txt": "qunit-composite/LICENSE.txt",
-
 				"requirejs/require.js": "requirejs/require.js",
 
 				"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
diff --git a/bower.json b/bower.json
index d672cfb30..e239f0b17 100644
--- a/bower.json
+++ b/bower.json
@@ -16,9 +16,6 @@
 		"jquery-mousewheel": "3.1.12",
 		"jquery-simulate": "1.1.1",
 		"qunit": "2.19.4",
-		"qunit-assert-classes": "1.0.2",
-		"qunit-assert-close": "JamesMGreene/qunit-assert-close#v2.1.2",
-		"qunit-composite": "JamesMGreene/qunit-composite#v2.0.0",
 		"requirejs": "2.1.14",
 
 		"jquery-1.8.0": "jquery#1.8.0",
diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index 277fecca7..a5bb1711b 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -12,8 +12,8 @@ requirejs.config( {
 		"jquery-simulate": "../../../external/jquery-simulate/jquery.simulate",
 		"lib": "../../lib",
 		"phantom-bridge": "../../../node_modules/grunt-contrib-qunit/phantomjs/bridge",
-		"qunit-assert-classes": "../../../external/qunit-assert-classes/qunit-assert-classes",
-		"qunit-assert-close": "../../../external/qunit-assert-close/qunit-assert-close",
+		"qunit-assert-classes": "../../lib/vendor/qunit-assert-classes/qunit-assert-classes",
+		"qunit-assert-close": "../../lib/vendor/qunit-assert-close/qunit-assert-close",
 		"qunit": "../../../external/qunit/qunit",
 		"testswarm": "https://swarm.jquery.org/js/inject.js?" + ( new Date() ).getTime(),
 		"ui": "../../../ui"
diff --git a/tests/lib/qunit-assert-domequal.js b/tests/lib/qunit-assert-domequal.js
index bdad9844c..066eb203b 100644
--- a/tests/lib/qunit-assert-domequal.js
+++ b/tests/lib/qunit-assert-domequal.js
@@ -15,11 +15,16 @@ var domEqual = QUnit.assert.domEqual = function( selector, modifier, message ) {
 	var assert = this;
 
 	// Get current state prior to modifier
-	var expected = extract( selector, message );
+	var expected = extract( assert, selector, message );
 
 	function done() {
-		var actual = extract( selector, message );
-		assert.push( QUnit.equiv( actual, expected ), actual, expected, message );
+		var actual = extract( assert, selector, message );
+		assert.pushResult( {
+			result: QUnit.equiv( actual, expected ),
+			actual: actual,
+			expected: expected,
+			message: message
+		} );
 	}
 
 	// Run modifier (async or sync), then compare state via done()
@@ -116,11 +121,15 @@ function jQueryVersionSince( version ) {
 	return compareVersions( $.fn.jquery, version ) >= 0;
 }
 
-function extract( selector, message ) {
+function extract( assert, selector, message ) {
 	var elem = $( selector );
 	if ( !elem.length ) {
-		QUnit.push( false, null, null,
-			"domEqual failed, can't extract " + selector + ", message was: " + message );
+		assert.pushResult( {
+			result: false,
+			actual: null,
+			expected: null,
+			message: "domEqual failed, can't extract " + selector + ", message was: " + message
+		} );
 		return;
 	}
 
@@ -190,7 +199,7 @@ function extract( selector, message ) {
 	children = elem.children();
 	if ( children.length ) {
 		result.children = elem.children().map( function() {
-			return extract( $( this ) );
+			return extract( assert, $( this ) );
 		} ).get();
 	} else {
 		result.text = elem.text();
diff --git a/external/qunit-assert-classes/LICENSE.txt b/tests/lib/vendor/qunit-assert-classes/LICENSE.txt
index 938db0368..938db0368 100644
--- a/external/qunit-assert-classes/LICENSE.txt
+++ b/tests/lib/vendor/qunit-assert-classes/LICENSE.txt
diff --git a/external/qunit-assert-classes/qunit-assert-classes.js b/tests/lib/vendor/qunit-assert-classes/qunit-assert-classes.js
index 93edebf9d..3461f1d90 100644
--- a/external/qunit-assert-classes/qunit-assert-classes.js
+++ b/tests/lib/vendor/qunit-assert-classes/qunit-assert-classes.js
@@ -1,3 +1,5 @@
+//  With custom modifications - all are marked with
+//  a "Custom modification" comment.
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
@@ -73,14 +75,22 @@
 		return message + ( classes.length > 1 ? "es" : "" );
 	}
 
-	QUnit.extend( QUnit.assert, {
+	// Custom modification: removing QUnit.extend
+	var key;
+	var qunitAssertExtensions = {
 		hasClasses: function( element, classes, message ) {
 			var classArray = splitClasses( classes ),
 				results = check( element, classArray );
 
 			message = message || pluralize( "Element must have class", classArray );
 
-			this.push( !results.missing.length, results.found.join( " " ), classes, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: !results.missing.length,
+				actual: results.found.join( " " ),
+				expected: classes,
+				message: message
+			} );
 		},
 		lacksClasses: function( element, classes, message ) {
 			var classArray = splitClasses( classes ),
@@ -88,7 +98,13 @@
 
 			message = message || pluralize( "Element must not have class", classArray );
 
-			this.push( !results.found.length, results.found.join( " " ), classes, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: !results.found.length,
+				actual: results.found.join( " " ),
+				expected: classes,
+				message: message
+			} );
 		},
 		hasClassesStrict: function( element, classes, message ) {
 			var result,
@@ -101,49 +117,91 @@
 				splitClasses( results.element.getAttribute( "class" ) ).length ===
 				results.found.length;
 
-			this.push( result, results.found.join( " " ), classes, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: result,
+				actual: results.found.join( " " ),
+				expected: classes,
+				message: message
+			} );
 		},
 		hasClassRegex: function( element, regex, message ) {
 			var results = check( element, regex );
 
 			message = message || "Element must have class matching " + regex;
 
-			this.push( !!results.found.length, results.found.join( " " ), regex, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: !!results.found.length,
+				actual: results.found.join( " " ),
+				expected: regex,
+				message: message
+			} );
 		},
 		lacksClassRegex: function( element, regex, message ) {
 			var results = check( element, regex );
 
 			message = message || "Element must not have class matching " + regex;
 
-			this.push( results.missing.length, results.missing.join( " " ), regex, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: results.missing.length,
+				actual: results.missing.join( " " ),
+				expected: regex,
+				message: message
+			} );
 		},
 		hasClassStart: function( element, partialClass, message ) {
 			var results = check( element, new RegExp( "^" + partialClass ) );
 
 			message = message || "Element must have class starting with " + partialClass;
 
-			this.push( results.found.length, results.found.join( " " ), partialClass, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: results.found.length,
+				actual: results.found.join( " " ),
+				expected: partialClass,
+				message: message
+			} );
 		},
 		lacksClassStart: function( element, partialClass, message ) {
 			var results = check( element, new RegExp( "^" + partialClass ) );
 
 			message = message || "Element must not have class starting with " + partialClass;
 
-			this.push( results.missing.length, results.missing.join( " " ), partialClass, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: results.missing.length,
+				actual: results.missing.join( " " ),
+				expected: partialClass,
+				message: message
+			} );
 		},
 		hasClassPartial: function( element, partialClass, message ) {
 			var results = check( element, new RegExp( partialClass ) );
 
 			message = message || "Element must have class containing '" + partialClass + "'";
 
-			this.push( results.found.length, results.found.join( " " ), partialClass, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: results.found.length,
+				actual: results.found.join( " " ),
+				expected: partialClass,
+				message: message
+			} );
 		},
 		lacksClassPartial: function( element, partialClass, message ) {
 			var results = check( element, new RegExp( partialClass ) );
 
 			message = message || "Element must not have class containing '" + partialClass + "'";
 
-			this.push( results.missing.length, results.missing.join( " " ), partialClass, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: results.missing.length,
+				actual: results.missing.join( " " ),
+				expected: partialClass,
+				message: message
+			} );
 		},
 		lacksAllClasses: function( element, message ) {
 			element = element.jquery ? element[ 0 ] : element;
@@ -153,7 +211,13 @@
 
 			message = message || "Element must not have any classes";
 
-			this.push( !classes.length, !classes.length, true, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: !classes.length,
+				actual: !classes.length,
+				expected: true,
+				message: message
+			} );
 		},
 		hasSomeClass: function( element, message ) {
 			element = element.jquery ? element[ 0 ] : element;
@@ -163,7 +227,19 @@
 
 			message = message || "Element must have a class";
 
-			this.push( classes.length, classes.length, true, message );
+			// Custom modification: push -> pushResult
+			this.pushResult( {
+				result: classes.length,
+				actual: classes.length,
+				expected: true,
+				message: message
+			} );
 		}
-	});
+	};
+
+	// Custom modification: removing QUnit.extend
+	for ( key in qunitAssertExtensions ) {
+		QUnit.assert[ key ] = qunitAssertExtensions[ key ];
+	}
+
 } ) );
diff --git a/external/qunit-assert-close/MIT-LICENSE.txt b/tests/lib/vendor/qunit-assert-close/MIT-LICENSE.txt
index aed5dc97e..aed5dc97e 100644
--- a/external/qunit-assert-close/MIT-LICENSE.txt
+++ b/tests/lib/vendor/qunit-assert-close/MIT-LICENSE.txt
diff --git a/external/qunit-assert-close/qunit-assert-close.js b/tests/lib/vendor/qunit-assert-close/qunit-assert-close.js
index 2eee713a0..69d405205 100644
--- a/external/qunit-assert-close/qunit-assert-close.js
+++ b/tests/lib/vendor/qunit-assert-close/qunit-assert-close.js
@@ -1,3 +1,5 @@
+//  With custom modifications - all are marked with
+//  a "Custom modification" comment.
 (function(factory) {
 
   // NOTE:
@@ -12,11 +14,10 @@
   else if (typeof module !== "undefined" && module && module.exports && typeof require === "function") {
     module.exports = factory(require("qunitjs"));
   }
-  // For CommonJS with `exports`, but without `module.exports`, like Rhino
-  else if (typeof exports !== "undefined" && exports && typeof require === "function") {
-    var qunit = require("qunitjs");
-    qunit.extend(exports, factory(qunit));
-  }
+
+  // Custom modification: remove the non-Node.js CommonJS part due to its
+  // usage of QUnit.extend.
+  //
   // For browser globals
   else {
     factory(QUnit);
@@ -75,7 +76,13 @@
 
     message = message || (actual + " should be within " + maxDifference + " (inclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff));
 
-    pushContext.push(result, actual, expected, message);
+    // Custom modification: push -> pushResult
+    pushContext.pushResult({
+      result: result,
+      actual: actual,
+      expected: expected,
+      message: message
+    });
   }
 
 
@@ -109,7 +116,13 @@
     }
     message = message || (actual + " should be within " + maxPercentDifference + "% (inclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff + "%"));
 
-    pushContext.push(result, actual, expected, message);
+    // Custom modification: push -> pushResult
+    pushContext.pushResult({
+      result: result,
+      actual: actual,
+      expected: expected,
+      message: message
+    });
   };
 
 
@@ -131,7 +144,13 @@
 
     message = message || (actual + " should not be within " + minDifference + " (exclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff));
 
-    pushContext.push(result, actual, expected, message);
+    // Custom modification: push -> pushResult
+    pushContext.pushResult({
+      result: result,
+      actual: actual,
+      expected: expected,
+      message: message
+    });
   }
 
 
@@ -165,10 +184,16 @@
     }
     message = message || (actual + " should not be within " + minPercentDifference + "% (exclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff + "%"));
 
-    pushContext.push(result, actual, expected, message);
+    // Custom modification: push -> pushResult
+    pushContext.pushResult({
+      result: result,
+      actual: actual,
+      expected: expected,
+      message: message
+    });
   };
 
-
+  var key;
   var api = {
     close: close,
     notClose: notClose,
@@ -176,7 +201,9 @@
     notClosePercent: notClose.percent
   };
 
-  QUnit.extend(QUnit.assert, api);
+  for (key in api) {
+    QUnit.assert[key] = api[key];
+  }
 
   return api;
 }));
diff --git a/external/qunit-composite/LICENSE.txt b/tests/lib/vendor/qunit-composite/LICENSE.txt
index 155d8e869..155d8e869 100644
--- a/external/qunit-composite/LICENSE.txt
+++ b/tests/lib/vendor/qunit-composite/LICENSE.txt
diff --git a/external/qunit-composite/qunit-composite.css b/tests/lib/vendor/qunit-composite/qunit-composite.css
index a5d06ce77..a5d06ce77 100644
--- a/external/qunit-composite/qunit-composite.css
+++ b/tests/lib/vendor/qunit-composite/qunit-composite.css
diff --git a/external/qunit-composite/qunit-composite.js b/tests/lib/vendor/qunit-composite/qunit-composite.js
index 8e4fda45a..042d024b4 100644
--- a/external/qunit-composite/qunit-composite.js
+++ b/tests/lib/vendor/qunit-composite/qunit-composite.js
@@ -1,6 +1,9 @@
 /**
  * QUnit Composite
  *
+ * With custom modifications - all are marked with
+ * a "Custom modification" comment.
+ *
  * https://github.com/JamesMGreene/qunit-composite
  *
  * Copyright jQuery Foundation and other contributors
@@ -93,7 +96,12 @@ function initIframe() {
 			// Pass all test details through to the main page
 			var message = ( moduleName ? moduleName + ": " : "" ) + testName + ": " + ( data.message || ( data.result ? "okay" : "failed" ) );
 			suiteAssert.expect( ++count );
-			suiteAssert.push( data.result, data.actual, data.expected, message );
+			suiteAssert.pushResult( {
+				result: data.result,
+				actual: data.actual,
+				expected: data.expected,
+				message: message
+			} );
 		});
 
 		// Continue the outer test when the iframe's test is done
diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html
index 3c247cdae..71593dd39 100644
--- a/tests/unit/accordion/all.html
+++ b/tests/unit/accordion/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/all.html b/tests/unit/all.html
index 22f60f7b5..3a39956f0 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -7,9 +7,9 @@
 	<script src="../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../external/qunit/qunit.js"></script>
-	<script src="../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../lib/vendor/qunit-composite/qunit-composite.js"></script>
 
 	<script>
 	(function() {
diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html
index 4ff90fe3c..94678956a 100644
--- a/tests/unit/autocomplete/all.html
+++ b/tests/unit/autocomplete/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/button/all.html b/tests/unit/button/all.html
index c370837b8..2d9f4a396 100644
--- a/tests/unit/button/all.html
+++ b/tests/unit/button/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/checkboxradio/all.html b/tests/unit/checkboxradio/all.html
index 71a65d9ee..68d599942 100644
--- a/tests/unit/checkboxradio/all.html
+++ b/tests/unit/checkboxradio/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/controlgroup/all.html b/tests/unit/controlgroup/all.html
index 737144acd..8409dc90c 100644
--- a/tests/unit/controlgroup/all.html
+++ b/tests/unit/controlgroup/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/core/all.html b/tests/unit/core/all.html
index c7834b81a..1fe23e195 100644
--- a/tests/unit/core/all.html
+++ b/tests/unit/core/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
index 314cfd570..062c7a6cc 100644
--- a/tests/unit/core/selector.js
+++ b/tests/unit/core/selector.js
@@ -11,23 +11,39 @@ define( [
 QUnit.module( "core - selectors", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.assert.isFocusable = function( selector, msg ) {
-	this.push( $( selector ).is( ":focusable" ), null, null,
-		msg + " - selector " + selector + " is focusable" );
+	this.pushResult( {
+		result: $( selector ).is( ":focusable" ),
+		actual: null,
+		expected: null,
+		message: msg + " - selector " + selector + " is focusable"
+	} );
 };
 
 QUnit.assert.isNotFocusable = function( selector, msg ) {
-	this.push( $( selector ).length && !$( selector ).is( ":focusable" ), null, null,
-		msg + " - selector " + selector + " is not focusable" );
+	this.pushResult( {
+		result: $( selector ).length && !$( selector ).is( ":focusable" ),
+		actual: null,
+		expected: null,
+		message: msg + " - selector " + selector + " is not focusable"
+	} );
 };
 
 QUnit.assert.isTabbable = function( selector, msg ) {
-	this.push( $( selector ).is( ":tabbable" ), null, null,
-		msg + " - selector " + selector + " is tabbable" );
+	this.pushResult( {
+		result: $( selector ).is( ":tabbable" ),
+		actual: null,
+		expected: null,
+		message: msg + " - selector " + selector + " is tabbable"
+	} );
 };
 
 QUnit.assert.isNotTabbable = function( selector, msg ) {
-	this.push( $( selector ).length && !$( selector ).is( ":tabbable" ), null, null,
-		msg + " - selector " + selector + " is not tabbable" );
+	this.pushResult( {
+		result: $( selector ).length && !$( selector ).is( ":tabbable" ),
+		actual: null,
+		expected: null,
+		message: msg + " - selector " + selector + " is not tabbable"
+	} );
 };
 
 QUnit.test( "data", function( assert ) {
diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html
index d2299a0f5..b3eb6a31a 100644
--- a/tests/unit/datepicker/all.html
+++ b/tests/unit/datepicker/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/dialog/all.html b/tests/unit/dialog/all.html
index 009b4a38d..059398995 100644
--- a/tests/unit/dialog/all.html
+++ b/tests/unit/dialog/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/draggable/all.html b/tests/unit/draggable/all.html
index 9bdc0d881..b785b67ea 100644
--- a/tests/unit/draggable/all.html
+++ b/tests/unit/draggable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/droppable/all.html b/tests/unit/droppable/all.html
index 4934e13d1..f6be092ed 100644
--- a/tests/unit/droppable/all.html
+++ b/tests/unit/droppable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/effects/all.html b/tests/unit/effects/all.html
index b043b6223..0de2b3798 100644
--- a/tests/unit/effects/all.html
+++ b/tests/unit/effects/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/effects/core.js b/tests/unit/effects/core.js
index 187f5355a..94321e636 100644
--- a/tests/unit/effects/core.js
+++ b/tests/unit/effects/core.js
@@ -23,11 +23,21 @@ define( [
 "use strict";
 
 QUnit.assert.present = function( value, array, message ) {
-	this.push( jQuery.inArray( value, array ) !== -1, value, array, message );
+	this.pushResult( {
+		result: jQuery.inArray( value, array ) !== -1,
+		actual: value,
+		expected: array,
+		message: message
+	} );
 };
 
 QUnit.assert.notPresent = function( value, array, message ) {
-	this.push( jQuery.inArray( value, array ) === -1, value, array, message );
+	this.pushResult( {
+		result: jQuery.inArray( value, array ) === -1,
+		actual: value,
+		expected: array,
+		message: message
+	} );
 };
 
 // MinDuration is used for "short" animate tests where we are only concerned about the final
diff --git a/tests/unit/form-reset-mixin/all.html b/tests/unit/form-reset-mixin/all.html
index 9acf969e3..38eeca95f 100644
--- a/tests/unit/form-reset-mixin/all.html
+++ b/tests/unit/form-reset-mixin/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/menu/all.html b/tests/unit/menu/all.html
index b8f7b3f37..f01c3ad39 100644
--- a/tests/unit/menu/all.html
+++ b/tests/unit/menu/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/position/all.html b/tests/unit/position/all.html
index 82e5cd9bc..43ad67386 100644
--- a/tests/unit/position/all.html
+++ b/tests/unit/position/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html
index b20bdd27e..ba2d79931 100644
--- a/tests/unit/progressbar/all.html
+++ b/tests/unit/progressbar/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html
index 486f26696..f219a5967 100644
--- a/tests/unit/resizable/all.html
+++ b/tests/unit/resizable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html
index 6f5cc5760..92dcbc730 100644
--- a/tests/unit/selectable/all.html
+++ b/tests/unit/selectable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/selectmenu/all.html b/tests/unit/selectmenu/all.html
index d4e339f96..f9eabaf9a 100644
--- a/tests/unit/selectmenu/all.html
+++ b/tests/unit/selectmenu/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/slider/all.html b/tests/unit/slider/all.html
index 17d375ab4..aeff8d08d 100644
--- a/tests/unit/slider/all.html
+++ b/tests/unit/slider/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/sortable/all.html b/tests/unit/sortable/all.html
index cb08860bc..8841e9ccd 100644
--- a/tests/unit/sortable/all.html
+++ b/tests/unit/sortable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/spinner/all.html b/tests/unit/spinner/all.html
index 2c64e1dce..b8269074b 100644
--- a/tests/unit/spinner/all.html
+++ b/tests/unit/spinner/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/tabs/all.html b/tests/unit/tabs/all.html
index 25f7bf3fd..81f54ce75 100644
--- a/tests/unit/tabs/all.html
+++ b/tests/unit/tabs/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html
index e87a76203..d0470c064 100644
--- a/tests/unit/tooltip/all.html
+++ b/tests/unit/tooltip/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html
index 7ef570bd1..336c8347a 100644
--- a/tests/unit/widget/all.html
+++ b/tests/unit/widget/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../external/jquery/jquery.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
+	<link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/qunit-composite/qunit-composite.js"></script>
+	<script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>