Tests: Push current structure

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

@@ -1,3 +1,16 @@
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define("", [
+			"qunit"
+		], factory );
+	} else {
+
+		// Browser globals
+		factory( QUnit );
+	}
+}( function( QUnit ) {
 /**
  * Checks that the first two arguments are equal, or are numbers close enough to be considered equal
  * based on a specified maximum allowable difference.
@@ -9,13 +22,11 @@
  * @param Number maxDifference (the maximum inclusive difference allowed between the actual and expected numbers)
  * @param String message (optional)
  */
-define([ "qunit" ], function (QUnit) {
-
 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);
+	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);
 }
 
 
@@ -31,23 +42,23 @@ function close(actual, expected, maxDifference, message) {
  * @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 + "%"));
+	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);
+	QUnit.push(result, actual, expected, message);
 };
 
 
@@ -63,10 +74,10 @@ close.percent = function closePercent(actual, expected, maxPercentDifference, me
  * @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);
+	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);
 }
 
 
@@ -82,28 +93,28 @@ function notClose(actual, expected, minDifference, message) {
  * @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 + "%"));
+	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.push(result, actual, expected, message);
 };
 
 
 QUnit.extend(QUnit.assert, {
-  close: close,
-  notClose: notClose
-});
+	close: close,
+	notClose: notClose
 });
+}));

tests/intern.js

@@ -13,8 +13,8 @@ define( [ "./config-helper" ], function ( configHelper ) {
 		maxConcurrency: 2,
 		tunnel: "BrowserStackTunnel",
 		loaders: {
-		"host-node": "requirejs",
-		"host-browser": "external/requirejs/require.js"
+			"host-node": "requirejs",
+			"host-browser": "external/requirejs/require.js"
 		},
 		loaderOptions: {
 			paths: {
@@ -24,23 +24,29 @@ define( [ "./config-helper" ], function ( configHelper ) {
 				"jquery-simulate": "external/jquery-simulate/jquery.simulate",
 				"jshint": "external/jshint/jshint",
 				"lib": "tests/lib",
-				"qunit": "intern!qunit",
 				"qunit-assert-classes": "external/qunit-assert-classes/qunit-assert-classes",
 				"qunit-assert-close": "external/qunit-assert-close/qunit-assert-close",
 				"text": "external/requirejs-text/text",
 				"ui": "ui",
-				"unit": "tests/unit"
+				"unit": "tests/unit",
 			},
 			map: {
 				"*": {
-					"qunit": "intern!qunit"
+					"qunit": "node_modules/intern/lib/interfaces/qunit",
+					"intern/dojo": "node_modules/intern/node_modules/dojo",
+					"dojo": 'node_modules/intern/node_modules/dojo',
+					"chai": 'node_modules/intern/node_modules/chai/chai',
+					"diff": 'node_modules/intern/node_modules/diff/diff'
 				}
 			},
 			shim: {
 				"globalize/ja-JP": [ "globalize" ],
 				"jquery-simulate": [ "jquery" ],
 				"qunit-assert-close": [ "qunit" ]
-			}
+			},
+			packages: [
+				{ name: 'intern', location: "node_modules/intern" }
+			]
 		},
 		suites: [
 			"tests/unit/all",

tests/lib/bootstrap.js

@@ -1,4 +1,4 @@
-define(function() {
+define( [ "require" ], function ( require ) {
 
 	// Create a module that disables back compat for UI modules
 	define( "jquery-no-back-compat", [ "jquery" ], function( $ ) {
@@ -29,11 +29,11 @@ define(function() {
 
 	// Load a set of test file along with the required test infrastructure
 	function requireTests( dependencies, noBackCompat ) {
-		dependencies = [
-			"lib/qunit",
+		dependencies = dependencies.concat([
 			noBackCompat ? "jquery-no-back-compat" : "jquery",
-			"jquery-simulate"
-		].concat( dependencies );
+			"jquery-simulate",
+			"lib/qunit"
+		]);
 
 		requireModules( dependencies, function( QUnit ) {
 			QUnit.start();

tests/lib/css.js

@@ -1,8 +1,8 @@
-define(function () {
+define( [] , function () {
 	return function( options ) {
 
 		function includeStyle( url ) {
-			document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
+			document.write( "<link rel='stylesheet' href='../../" + url + "'>" );
 		}
 
 		// Find the script element

tests/unit/accordion/core.js

@@ -36,12 +36,12 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
 	});
 });
 
-QUnit.test( "handle click on header-descendant", function( assert ) {
-	assert.expect( 1 );
-	var element = $( "#navigation" ).accordion();
-	$( "#navigation h2:eq(1) a" ).trigger( "click" );
-	state( assert, element, 0, 1, 0 );
-});
+// QUnit.test( "handle click on header-descendant", function( assert ) {
+// 	assert.expect( 1 );
+// 	var element = $( "#navigation" ).accordion();
+// 	$( "#navigation h2:eq(1) a" ).trigger( "click" );
+// 	state( assert, element, 0, 1, 0 );
+// });
 
 QUnit.test( "accessibility", function ( assert ) {
 	assert.expect( 61 );

tests/unit/accordion/helper.js

@@ -7,6 +7,9 @@ define( [
 	"ui/accordion"
 ], function( $, helper, bootstrap, cssjs, htmlContent ) {
 
+bootstrap( { widget: "accordion" } );
+cssjs( { module: "core accordion" } );
+
 return $.extend( helper, {
 	equalHeight: function( assert, accordion, height ) {
 		accordion.find( ".ui-accordion-content" ).each(function() {
@@ -18,8 +21,6 @@ return $.extend( helper, {
 		var animate = $.ui.accordion.prototype.options.animate;
 		return {
 			setup: function() {
-				bootstrap( { widget: "accordion" } );
-				cssjs( { module: "core accordion" } );
 				$("html").append(htmlContent);
 				$.ui.accordion.prototype.options.animate = false;
 			},

tests/unit/all.js

@@ -1,6 +1,6 @@
 define([
 	"tests/unit/accordion/core",
-	"tests/unit/accordion/events",
-	"tests/unit/accordion/methods",
-	"tests/unit/accordion/options"
+	// "tests/unit/accordion/events",
+	// "tests/unit/accordion/methods"
+	// "tests/unit/accordion/options"
 ]);