Convert test infrastructure to AMD

Gruntfile.js

@@ -225,6 +225,7 @@ grunt.initConfig({
 			return !( /(all|index|test)\.html$/ ).test( file );
 		}),
 		options: {
+			inject: false,
 			page: {
 				viewportSize: { width: 700, height: 500 }
 			}
@@ -280,10 +281,15 @@ grunt.initConfig({
 				"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",
 				"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",
 

bower.json

@@ -16,7 +16,9 @@
 		"jshint": "2.4.4",
 		"qunit": "1.18.0",
 		"qunit-assert-classes": "0.1.5",
-		"qunit-composite": "JamesMGreene/qunit-composite#v1.0.4",
+		"qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1",
+		"qunit-composite": "JamesMGreene/qunit-composite#v1.1.0",
+		"requirejs": "2.1.14",
 
 		"jquery-1.7.0": "jquery#1.7.0",
 		"jquery-1.7.1": "jquery#1.7.1",

external/qunit-assert-close/MIT-LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

external/qunit-assert-close/qunit-assert-close.js

@@ -0,0 +1,106 @@
+/**
+ * Checks that the first two arguments are equal, or are numbers close enough to be considered equal
+ * based on a specified maximum allowable difference.
+ *
+ * @example assert.close(3.141, Math.PI, 0.001);
+ *
+ * @param Number actual
+ * @param Number expected
+ * @param Number maxDifference (the maximum inclusive difference allowed between the actual and expected numbers)
+ * @param String message (optional)
+ */
+function close(actual, expected, maxDifference, message) {
+  var actualDiff = (actual === expected) ? 0 : Math.abs(actual - expected),
+      result = actualDiff <= maxDifference;
+  message = message || (actual + " should be within " + maxDifference + " (inclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff));
+  QUnit.push(result, actual, expected, message);
+}
+
+
+/**
+ * Checks that the first two arguments are equal, or are numbers close enough to be considered equal
+ * based on a specified maximum allowable difference percentage.
+ *
+ * @example assert.close.percent(155, 150, 3.4);  // Difference is ~3.33%
+ *
+ * @param Number actual
+ * @param Number expected
+ * @param Number maxPercentDifference (the maximum inclusive difference percentage allowed between the actual and expected numbers)
+ * @param String message (optional)
+ */
+close.percent = function closePercent(actual, expected, maxPercentDifference, message) {
+  var actualDiff, result;
+  if (actual === expected) {
+    actualDiff = 0;
+    result = actualDiff <= maxPercentDifference;
+  }
+  else if (actual !== 0 && expected !== 0 && expected !== Infinity && expected !== -Infinity) {
+    actualDiff = Math.abs(100 * (actual - expected) / expected);
+    result = actualDiff <= maxPercentDifference;
+  }
+  else {
+    // Dividing by zero (0)!  Should return `false` unless the max percentage was `Infinity`
+    actualDiff = Infinity;
+    result = maxPercentDifference === Infinity;
+  }
+  message = message || (actual + " should be within " + maxPercentDifference + "% (inclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff + "%"));
+
+  QUnit.push(result, actual, expected, message);
+};
+
+
+/**
+ * Checks that the first two arguments are numbers with differences greater than the specified
+ * minimum difference.
+ *
+ * @example assert.notClose(3.1, Math.PI, 0.001);
+ *
+ * @param Number actual
+ * @param Number expected
+ * @param Number minDifference (the minimum exclusive difference allowed between the actual and expected numbers)
+ * @param String message (optional)
+ */
+function notClose(actual, expected, minDifference, message) {
+  var actualDiff = Math.abs(actual - expected),
+      result = actualDiff > minDifference;
+  message = message || (actual + " should not be within " + minDifference + " (exclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff));
+  QUnit.push(result, actual, expected, message);
+}
+
+
+/**
+ * Checks that the first two arguments are numbers with differences greater than the specified
+ * minimum difference percentage.
+ *
+ * @example assert.notClose.percent(156, 150, 3.5);  // Difference is 4.0%
+ *
+ * @param Number actual
+ * @param Number expected
+ * @param Number minPercentDifference (the minimum exclusive difference percentage allowed between the actual and expected numbers)
+ * @param String message (optional)
+ */
+notClose.percent = function notClosePercent(actual, expected, minPercentDifference, message) {
+  var actualDiff, result;
+  if (actual === expected) {
+    actualDiff = 0;
+    result = actualDiff > minPercentDifference;
+  }
+  else if (actual !== 0 && expected !== 0 && expected !== Infinity && expected !== -Infinity) {
+    actualDiff = Math.abs(100 * (actual - expected) / expected);
+    result = actualDiff > minPercentDifference;
+  }
+  else {
+    // Dividing by zero (0)!  Should only return `true` if the min percentage was `Infinity`
+    actualDiff = Infinity;
+    result = minPercentDifference !== Infinity;
+  }
+  message = message || (actual + " should not be within " + minPercentDifference + "% (exclusive) of " + expected + (result ? "" : ". Actual: " + actualDiff + "%"));
+
+  QUnit.push(result, actual, expected, message);
+};
+
+
+QUnit.extend(QUnit.assert, {
+  close: close,
+  notClose: notClose
+});

external/qunit-composite/qunit-composite.js

@@ -1,13 +1,19 @@
 /**
- * QUnit Composite v1.0.4
+ * QUnit Composite v1.0.5-pre
  *
  * https://github.com/JamesMGreene/qunit-composite
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * https://jquery.org/license/
  */
-(function( QUnit ) {
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+		define( [ "qunit" ], factory );
+	} else {
+		factory( QUnit );
+	}
+}(function( QUnit ) {
 var iframe, hasBound,
 	modules = 1,
 	executingComposite = false;
@@ -60,6 +66,11 @@ function initIframe() {
 			return;
 		}
 
+		// Deal with QUnit being loaded asynchronously via AMD
+		if ( !iframeWin.QUnit && iframeWin.define && iframeWin.define.amd ) {
+			return iframeWin.require( [ "qunit" ], onIframeLoad );
+		}
+
 		iframeWin.QUnit.moduleStart(function( data ) {
 			// Capture module name for messages
 			moduleName = data.name;
@@ -181,4 +192,4 @@ QUnit.testDone(function( data ) {
 	current.getElementsByTagName( "a" )[ 0 ].href = src;
 });
 
-})( QUnit );
+}));