Build: Update to qunit-assert-classes to V 1.0.2

Closes gh-1547

3 files changed, 141 insertions, 20 deletions

diff --git a/bower.json b/bower.json
index b5b8e4420..b7a657b9d 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,7 @@
 		"jquery-simulate": "1.0.0",
 		"jshint": "2.4.4",
 		"qunit": "1.18.0",
-		"qunit-assert-classes": "0.1.5",
+		"qunit-assert-classes": "1.0.2",
 		"qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1",
 		"qunit-composite": "JamesMGreene/qunit-composite#v1.1.0",
 		"requirejs": "2.1.14",
diff --git a/external/qunit-assert-classes/qunit-assert-classes.js b/external/qunit-assert-classes/qunit-assert-classes.js
index f61046bc8..93edebf9d 100644
--- a/external/qunit-assert-classes/qunit-assert-classes.js
+++ b/external/qunit-assert-classes/qunit-assert-classes.js
@@ -1,47 +1,169 @@
-( function( QUnit ) {
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [
+			"qunit"
+		], factory );
+	} else {
+
+		// Browser globals
+		factory( QUnit );
+	}
+}( function( QUnit ) {
+
 	function inArray( haystack, needle ) {
 		for ( var i = 0; i < haystack.length; i++ ) {
-			if ( haystack[ i ] === needle ) {
+			if (
+					( needle instanceof RegExp && needle.test( haystack[ i ] ) )||
+					( typeof needle === "string" && haystack[ i ] === needle )
+			) {
 				return true;
 			}
 		}
 		return false;
 	}
-	function check( element, classes, stateVal, message ) {
-		var i, result, classAttribute, elementClassArray,
-			classArray = classes.split( " " ),
+
+	function check( element, search ) {
+		var i, classAttribute, elementClassArray,
 			missing = [],
 			found = [];
 
 		if ( element.jquery && element.length !== 1 ) {
-			throw( "Class checks can only be performed on a single element on a collection" );
+			throw new Error( "Class checks can only be performed on a single element on a collection" );
 		}
+
 		element = element.jquery ? element[ 0 ] : element;
 		classAttribute = element.getAttribute( "class" );
-		message = message || "Element must " + ( stateVal? "" : "not " ) + "have classes";
+
 		if ( classAttribute ) {
-			elementClassArray = classAttribute.split( " " );
-			for( i = 0; i < classArray.length; i++ ) {
-				if ( !inArray( elementClassArray, classArray[ i ] ) ) {
-					missing.push( classArray[ i ] );
+			elementClassArray = splitClasses( classAttribute );
+			if ( search instanceof RegExp ) {
+				if ( inArray( elementClassArray, search ) ) {
+					found.push( search );
 				} else {
-					found.push( classArray[ i ] );
+					missing.push( search );
+				}
+			} else {
+				for( i = 0; i < search.length; i++ ) {
+					if ( !inArray( elementClassArray, search[ i ] ) ) {
+						missing.push( search[ i ] );
+					} else {
+						found.push( search[ i ] );
+					}
 				}
 			}
 		} else {
-			missing = classArray;
+			missing = search;
 		}
 
-		result = stateVal ? !missing.length : !found.length;
-		QUnit.push( result, classes, result ? classes : found.join( " " ), message );
+		return {
+			missing: missing,
+			found: found,
+			element: element,
+			classAttribute: classAttribute
+		};
+	}
+
+	function splitClasses( classes ) {
+		return classes.match( /\S+/g ) || [];
+	}
+
+	function pluralize( message, classes ) {
+		return message + ( classes.length > 1 ? "es" : "" );
 	}
 
 	QUnit.extend( QUnit.assert, {
 		hasClasses: function( element, classes, message ) {
-			check( element, classes, true, 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 );
 		},
 		lacksClasses: function( element, classes, message ) {
-			check( element, classes, false, message );
+			var classArray = splitClasses( classes ),
+				results = check( element, classArray );
+
+			message = message || pluralize( "Element must not have class", classArray );
+
+			this.push( !results.found.length, results.found.join( " " ), classes, message );
+		},
+		hasClassesStrict: function( element, classes, message ) {
+			var result,
+				classArray = splitClasses( classes ),
+				results = check( element, classArray );
+
+			message = message || pluralize( "Element must only have class", classArray );
+
+			result =  !results.missing.length && results.element.getAttribute( "class" ) &&
+				splitClasses( results.element.getAttribute( "class" ) ).length ===
+				results.found.length;
+
+			this.push( result, results.found.join( " " ), classes, 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 );
+		},
+		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 );
+		},
+		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 );
+		},
+		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 );
+		},
+		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 );
+		},
+		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 );
+		},
+		lacksAllClasses: function( element, message ) {
+			element = element.jquery ? element[ 0 ] : element;
+
+			var classAttribute = element.getAttribute( "class" ) || "",
+				classes = splitClasses( classAttribute );
+
+			message = message || "Element must not have any classes";
+
+			this.push( !classes.length, !classes.length, true, message );
+		},
+		hasSomeClass: function( element, message ) {
+			element = element.jquery ? element[ 0 ] : element;
+
+			var classAttribute = element.getAttribute( "class" ) || "",
+				classes = splitClasses( classAttribute );
+
+			message = message || "Element must have a class";
+
+			this.push( classes.length, classes.length, true, message );
 		}
 	});
-})( QUnit );
\ No newline at end of file
+} ) );
diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index 1c5527816..6fd094734 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -18,7 +18,6 @@ requirejs.config({
 	shim: {
 		"globalize/ja-JP": [ "globalize" ],
 		"jquery-simulate": [ "jquery" ],
-		"qunit-assert-classes": [ "qunit" ],
 		"qunit-assert-close": [ "qunit" ],
 		"testswarm": [ "qunit" ]
 	}