Tests: Shift all tests to use no globals

tests/.jshintrc

@@ -18,24 +18,11 @@
 	"jquery": true,
 
 	"globals": {
-		"asyncTest": false,
-		"deepEqual": false,
 		"define": false,
-		"equal": false,
-		"expect": false,
 		"Globalize": false,
-		"module": false,
-		"notEqual": false,
-		"notDeepEqual": false,
-		"notStrictEqual": false,
-		"ok": false,
-		"QUnit": true,
+		"QUnit": false,
 		"require": true,
 		"requirejs": true,
-		"start": false,
-		"strictEqual": false,
-		"stop": false,
-		"test": false,
 		"JSHINT": false
 	}
 }

tests/lib/common.js

@@ -1,81 +1,82 @@
 define( [
-	"jquery"
-], function( $ ) {
+	"qunit",
+	"jquery" ],
+function( QUnit, $ ) {
 
 var exports = {};
 
 function testWidgetDefaults( widget, defaults ) {
 	var pluginDefaults = $.ui[ widget ].prototype.options;
 
 	// Ensure that all defaults have the correct value
-	test( "defined defaults", function() {
+	QUnit.test( "defined defaults", function( assert ) {
 		var count = 0;
 		$.each( defaults, function( key, val ) {
-			expect( ++count );
+			assert.expect( ++count );
 			if ( $.isFunction( val ) ) {
-				ok( $.isFunction( pluginDefaults[ key ] ), key );
+				assert.ok( $.isFunction( pluginDefaults[ key ] ), key );
 				return;
 			}
-			deepEqual( pluginDefaults[ key ], val, key );
+			assert.deepEqual( pluginDefaults[ key ], val, key );
 		} );
 	} );
 
 	// Ensure that all defaults were tested
-	test( "tested defaults", function() {
+	QUnit.test( "tested defaults", function( assert ) {
 		var count = 0;
 		$.each( pluginDefaults, function( key ) {
-			expect( ++count );
-			ok( key in defaults, key );
+			assert.expect( ++count );
+			assert.ok( key in defaults, key );
 		} );
 	} );
 }
 
 function testWidgetOverrides( widget ) {
 	if ( $.uiBackCompat === false ) {
-		test( "$.widget overrides", function() {
-			expect( 4 );
+		QUnit.test( "$.widget overrides", function( assert ) {
+			assert.expect( 4 );
 			$.each( [
 				"_createWidget",
 				"destroy",
 				"option",
 				"_trigger"
 			], function( i, method ) {
-				strictEqual( $.ui[ widget ].prototype[ method ],
+				assert.strictEqual( $.ui[ widget ].prototype[ method ],
 					$.Widget.prototype[ method ], "should not override " + method );
 			} );
 		} );
 	}
 }
 
 function testBasicUsage( widget ) {
-	test( "basic usage", function() {
-		expect( 3 );
+	QUnit.test( "basic usage", function( assert ) {
+		assert.expect( 3 );
 
 		var defaultElement = $.ui[ widget ].prototype.defaultElement;
 		$( defaultElement ).appendTo( "body" )[ widget ]().remove();
-		ok( true, "initialized on element" );
+		assert.ok( true, "initialized on element" );
 
 		$( defaultElement )[ widget ]().remove();
-		ok( true, "initialized on disconnected DOMElement - never connected" );
+		assert.ok( true, "initialized on disconnected DOMElement - never connected" );
 
 		// Ensure manipulating removed elements works (#3664)
 		$( defaultElement ).appendTo( "body" ).remove()[ widget ]().remove();
-		ok( true, "initialized on disconnected DOMElement - removed" );
+		assert.ok( true, "initialized on disconnected DOMElement - removed" );
 	} );
 }
 
 exports.testWidget = function( widget, settings ) {
-	module( widget + ": common widget" );
+	QUnit.module( widget + ": common widget" );
 
 	exports.testJshint( "/widgets/" + widget );
 	testWidgetDefaults( widget, settings.defaults );
 	testWidgetOverrides( widget );
 	if ( !settings.noDefaultElement ) {
 		testBasicUsage( widget );
 	}
-	test( "version", function() {
-		expect( 1 );
-		ok( "version" in $.ui[ widget ].prototype, "version property exists" );
+	QUnit.test( "version", function( assert ) {
+		assert.expect( 1 );
+		assert.ok( "version" in $.ui[ widget ].prototype, "version property exists" );
 	} );
 };
 
@@ -87,9 +88,10 @@ exports.testJshint = function( module ) {
 		return;
 	}
 
-	asyncTest( "JSHint", function() {
+	QUnit.test( "JSHint", function( assert ) {
+		var ready = assert.async();
 		require( [ "jshint" ], function() {
-			expect( 1 );
+			assert.expect( 1 );
 
 			$.when(
 				$.ajax( {
@@ -119,12 +121,12 @@ exports.testJshint = function( module ) {
 						return "[L" + error.line + ":C" + error.character + "] " +
 							error.reason + "\n" + error.evidence + "\n";
 					} ).join( "\n" );
-					ok( passed, errors );
-					start();
+					assert.ok( passed, errors );
+					ready();
 				} )
 				.fail( function( hintError, srcError ) {
-					ok( false, "error loading source: " + ( hintError || srcError ).statusText );
-					start();
+					assert.ok( false, "error loading source: " + ( hintError || srcError ).statusText );
+					ready();
 				} );
 		} );
 	} );

tests/unit/accordion/core.js

@@ -1,129 +1,131 @@
 define( [
+	"qunit",
 	"jquery",
 	"./helper",
 	"ui/widgets/accordion"
-], function( $, testHelper ) {
+], function( QUnit, $, testHelper ) {
 
 var setupTeardown = testHelper.setupTeardown,
 	state = testHelper.state;
 
-module( "accordion: core", setupTeardown() );
+QUnit.module( "accordion: core", setupTeardown() );
 
 $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
-	test( "markup structure: " + type, function( assert ) {
-		expect( 10 );
+	QUnit.test( "markup structure: " + type, function( assert ) {
+		assert.expect( 10 );
 		var element = $( selector ).accordion(),
 			headers = element.find( ".ui-accordion-header" ),
 			content = headers.next();
 
 		assert.hasClasses( element, "ui-accordion ui-widget" );
-		equal( headers.length, 3, ".ui-accordion-header elements exist, correct number" );
+		assert.equal( headers.length, 3, ".ui-accordion-header elements exist, correct number" );
 		assert.hasClasses( headers[ 0 ],
 			"ui-accordion-header ui-accordion-header-active ui-accordion-icons" );
 		assert.hasClasses( headers[ 1 ],
 			"ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" );
 		assert.hasClasses( headers[ 2 ],
 			"ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" );
-		equal( content.length, 3, ".ui-accordion-content elements exist, correct number" );
+		assert.equal( content.length, 3, ".ui-accordion-content elements exist, correct number" );
 		assert.hasClasses( content[ 0 ],
 			"ui-accordion-content ui-widget-content ui-accordion-content-active" );
 		assert.hasClasses( content[ 1 ], "ui-accordion-content ui-widget-content" );
 		assert.hasClasses( content[ 2 ], "ui-accordion-content ui-widget-content" );
-		deepEqual( element.find( ".ui-accordion-header" ).next().get(),
+		assert.deepEqual( element.find( ".ui-accordion-header" ).next().get(),
 			element.find( ".ui-accordion-content" ).get(),
 			"content panels come immediately after headers" );
 	} );
 } );
 
-test( "handle click on header-descendant", function() {
-	expect( 1 );
+QUnit.test( "handle click on header-descendant", function( assert ) {
+	assert.expect( 1 );
 	var element = $( "#navigation" ).accordion();
 	$( "#navigation h2:eq(1) a" ).trigger( "click" );
-	state( element, 0, 1, 0 );
+	state( assert, element, 0, 1, 0 );
 } );
 
-test( "accessibility", function() {
-	expect( 61 );
+QUnit.test( "accessibility", function( assert ) {
+	assert.expect( 61 );
 	var element = $( "#list1" ).accordion( {
 			active: 1,
 			collapsible: true
 		} ),
 		headers = element.find( ".ui-accordion-header" );
 
-	equal( element.attr( "role" ), "tablist", "element role" );
+	assert.equal( element.attr( "role" ), "tablist", "element role" );
 	headers.each( function( i ) {
 		var header = headers.eq( i ),
 			panel = header.next();
-		equal( header.attr( "role" ), "tab", "header " + i + " role" );
-		equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" );
-		equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" );
-		equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" );
+		assert.equal( header.attr( "role" ), "tab", "header " + i + " role" );
+		assert.equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" );
+		assert.equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" );
+		assert.equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" );
 	} );
 
-	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
-	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+	assert.equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
+	assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
+	assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
+	assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
+	assert.equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
+	assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
+	assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
+	assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
+	assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
 
 	element.accordion( "option", "active", 0 );
-	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header (0) has tabindex=0" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab (0) has aria-selected=true" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab (0) has aria-expanded=true" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel (0) has aria-hidden=false" );
-	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+	assert.equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header (0) has tabindex=0" );
+	assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab (0) has aria-selected=true" );
+	assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab (0) has aria-expanded=true" );
+	assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel (0) has aria-hidden=false" );
+	assert.equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
+	assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
+	assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
+	assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
+	assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
 
 	element.accordion( "option", "active", false );
-	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "previously active header (0) has tabindex=0" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
-	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+	assert.equal( headers.eq( 0 ).attr( "tabindex" ), 0, "previously active header (0) has tabindex=0" );
+	assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
+	assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
+	assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
+	assert.equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" );
+	assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" );
+	assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" );
+	assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" );
+	assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
 
 	element.accordion( "option", "active", 1 );
-	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
-	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
-	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
-	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
-	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
-	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
-	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
-	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
-	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
-	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
+	assert.equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
+	assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" );
+	assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" );
+	assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" );
+	assert.equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" );
+	assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" );
+	assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" );
+	assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" );
+	assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" );
+	assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" );
+	assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" );
+	assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" );
 
 } );
 
-asyncTest( "keyboard support", function( assert ) {
-	expect( 13 );
+QUnit.test( "keyboard support", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 13 );
 	var element = $( "#list1" ).accordion(),
 		headers = element.find( ".ui-accordion-header" ),
 		anchor = headers.eq( 1 ).next().find( "a" ).eq( 0 ),
 		keyCode = $.ui.keyCode;
-	equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" );
+	assert.equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" );
 	headers.eq( 0 ).simulate( "focus" );
 	setTimeout( step1 );
 
@@ -180,13 +182,13 @@ asyncTest( "keyboard support", function( assert ) {
 	}
 
 	function step9() {
-		equal( element.accordion( "option", "active" ), 2, "ENTER activates panel" );
+		assert.equal( element.accordion( "option", "active" ), 2, "ENTER activates panel" );
 		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
 		setTimeout( step10 );
 	}
 
 	function step10() {
-		equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" );
+		assert.equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" );
 		anchor.simulate( "focus" );
 		setTimeout( step11 );
 	}
@@ -200,7 +202,7 @@ asyncTest( "keyboard support", function( assert ) {
 
 	function step12() {
 		assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "CTRL+UP moves focus to header" );
-		start();
+		ready();
 	}
 } );