Autocomplete: Shift to use no globals

1 files changed, 51 insertions, 44 deletions

diff --git a/tests/unit/autocomplete/events.js b/tests/unit/autocomplete/events.js
index 688763f7e..f02d36dd7 100644
--- a/tests/unit/autocomplete/events.js
+++ b/tests/unit/autocomplete/events.js
@@ -1,9 +1,10 @@
 define( [
+	"qunit",
 	"jquery",
 	"ui/widgets/autocomplete"
-], function( $ ) {
+], function( QUnit, $ ) {
 
-module( "autocomplete: events" );
+QUnit.module( "autocomplete: events" );
 
 var data = [ "Clojure", "COBOL", "ColdFusion", "Java", "JavaScript", "Scala", "Scheme" ];
 
@@ -24,18 +25,19 @@ $.each( [
 		valueMethod: "text"
 	}
 ], function( i, settings ) {
-	asyncTest( "all events - " + settings.type, function() {
-		expect( 13 );
+	QUnit.test( "all events - " + settings.type, function( assert ) {
+		var ready = assert.async();
+		assert.expect( 13 );
 		var element = $( settings.selector )
 				.autocomplete( {
 					autoFocus: false,
 					delay: 0,
 					source: data,
 					search: function( event ) {
-						equal( event.originalEvent.type, "keydown", "search originalEvent" );
+						assert.equal( event.originalEvent.type, "keydown", "search originalEvent" );
 					},
 					response: function( event, ui ) {
-						deepEqual( ui.content, [
+						assert.deepEqual( ui.content, [
 							{ label: "Clojure", value: "Clojure" },
 							{ label: "Java", value: "Java" },
 							{ label: "JavaScript", value: "JavaScript" }
@@ -43,32 +45,32 @@ $.each( [
 						ui.content.splice( 0, 1 );
 					},
 					open: function() {
-						ok( menu.is( ":visible" ), "menu open on open" );
+						assert.ok( menu.is( ":visible" ), "menu open on open" );
 					},
 					focus: function( event, ui ) {
-						equal( event.originalEvent.type, "menufocus", "focus originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "focus ui.item" );
+						assert.equal( event.originalEvent.type, "menufocus", "focus originalEvent" );
+						assert.deepEqual( ui.item, { label: "Java", value: "Java" }, "focus ui.item" );
 					},
 					close: function( event ) {
-						equal( event.originalEvent.type, "menuselect", "close originalEvent" );
-						ok( menu.is( ":hidden" ), "menu closed on close" );
+						assert.equal( event.originalEvent.type, "menuselect", "close originalEvent" );
+						assert.ok( menu.is( ":hidden" ), "menu closed on close" );
 					},
 					select: function( event, ui ) {
-						equal( event.originalEvent.type, "menuselect", "select originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "select ui.item" );
+						assert.equal( event.originalEvent.type, "menuselect", "select originalEvent" );
+						assert.deepEqual( ui.item, { label: "Java", value: "Java" }, "select ui.item" );
 					},
 					change: function( event, ui ) {
-						equal( event.originalEvent.type, "blur", "change originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" );
-						ok( menu.is( ":hidden" ), "menu closed on change" );
-						start();
+						assert.equal( event.originalEvent.type, "blur", "change originalEvent" );
+						assert.deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" );
+						assert.ok( menu.is( ":hidden" ), "menu closed on change" );
+						ready();
 					}
 				} ),
 			menu = element.autocomplete( "widget" );
 
 		element.simulate( "focus" )[ settings.valueMethod ]( "j" ).trigger( "keydown" );
 		setTimeout( function() {
-			ok( menu.is( ":visible" ), "menu is visible after delay" );
+			assert.ok( menu.is( ":visible" ), "menu is visible after delay" );
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 
@@ -80,53 +82,56 @@ $.each( [
 	} );
 } );
 
-asyncTest( "change without selection", function() {
-	expect( 1 );
+QUnit.test( "change without selection", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 1 );
 	var element = $( "#autocomplete" ).autocomplete( {
 		delay: 0,
 		source: data,
 		change: function( event, ui ) {
-			strictEqual( ui.item, null );
-			start();
+			assert.strictEqual( ui.item, null );
+			ready();
 		}
 	} );
 	element.triggerHandler( "focus" );
 	element.val( "ja" ).triggerHandler( "blur" );
 } );
 
-asyncTest( "cancel search", function() {
-	expect( 6 );
+QUnit.test( "cancel search", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 6 );
 	var first = true,
 		element = $( "#autocomplete" ).autocomplete( {
 			delay: 0,
 			source: data,
 			search: function() {
 				if ( first ) {
-					equal( element.val(), "ja", "val on first search" );
+					assert.equal( element.val(), "ja", "val on first search" );
 					first = false;
 					return false;
 				}
-				equal( element.val(), "java", "val on second search" );
+				assert.equal( element.val(), "java", "val on second search" );
 			},
 			open: function() {
-				ok( true, "menu opened" );
+				assert.ok( true, "menu opened" );
 			}
 		} ),
 		menu = element.autocomplete( "widget" );
 	element.val( "ja" ).trigger( "keydown" );
 	setTimeout( function() {
-		ok( menu.is( ":hidden" ), "menu is hidden after first search" );
+		assert.ok( menu.is( ":hidden" ), "menu is hidden after first search" );
 		element.val( "java" ).trigger( "keydown" );
 		setTimeout( function() {
-			ok( menu.is( ":visible" ), "menu is visible after second search" );
-			equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" );
-			start();
+			assert.ok( menu.is( ":visible" ), "menu is visible after second search" );
+			assert.equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" );
+			ready();
 		} );
 	} );
 } );
 
-asyncTest( "cancel focus", function() {
-	expect( 1 );
+QUnit.test( "cancel focus", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 1 );
 	var customVal = "custom value",
 		element = $( "#autocomplete" ).autocomplete( {
 			delay: 0,
@@ -139,13 +144,14 @@ asyncTest( "cancel focus", function() {
 	element.val( "ja" ).trigger( "keydown" );
 	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-		equal( element.val(), customVal );
-		start();
+		assert.equal( element.val(), customVal );
+		ready();
 	} );
 } );
 
-asyncTest( "cancel select", function() {
-	expect( 1 );
+QUnit.test( "cancel select", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 1 );
 	var customVal = "custom value",
 		element = $( "#autocomplete" ).autocomplete( {
 			delay: 0,
@@ -159,25 +165,26 @@ asyncTest( "cancel select", function() {
 	setTimeout( function() {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-		equal( element.val(), customVal );
-		start();
+		assert.equal( element.val(), customVal );
+		ready();
 	} );
 } );
 
-asyncTest( "blur during remote search", function() {
-	expect( 1 );
+QUnit.test( "blur during remote search", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 1 );
 	var ac = $( "#autocomplete" ).autocomplete( {
 		delay: 0,
 		source: function( request, response ) {
-			ok( true, "trigger request" );
+			assert.ok( true, "trigger request" );
 			ac.simulate( "blur" );
 			setTimeout( function() {
 				response( [ "result" ] );
-				start();
+				ready();
 			}, 25 );
 		},
 		open: function() {
-			ok( false, "opened after a blur" );
+			assert.ok( false, "opened after a blur" );
 		}
 	} );
 	ac.val( "ro" ).trigger( "keydown" );