1 files changed, 58 insertions, 48 deletions

diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js
index 19f52dc15..3f92aa01f 100644
--- a/tests/unit/autocomplete/autocomplete_core.js
+++ b/tests/unit/autocomplete/autocomplete_core.js
@@ -1,73 +1,83 @@
-/*
- * autocomplete_core.js
- */
+(function( $ ) {
 
+module( "autocomplete: core" );
 
-(function($) {
+asyncTest( "close-on-blur is properly delayed", function() {
+	expect( 3 );
+	var element = $( "#autocomplete" )
+			.autocomplete({
+				source: [ "java", "javascript" ]
+			})
+			.val( "ja" )
+			.autocomplete( "search" ),
+		menu = element.autocomplete( "widget" );
 
-module("autocomplete: core", {
-	teardown: function() {
-		$( ":ui-autocomplete" ).autocomplete( "destroy" );
-	}
-});
-
-test("close-on-blur is properly delayed", function() {
-	var ac = $("#autocomplete").autocomplete({
-		source: ["java", "javascript"]
-	}).val("ja").autocomplete("search");
-	same( $(".ui-menu:visible").length, 1 );
-	ac.blur();
-	same( $(".ui-menu:visible").length, 1 );
-	stop();
+	ok( menu.is( ":visible" ) );
+	element.blur();
+	ok( menu.is( ":visible" ) );
 	setTimeout(function() {
-		same( $(".ui-menu:visible").length, 0 );
+		ok( menu.is( ":hidden") );
 		start();
-	}, 200);
+	}, 200 );
 });
 
-test("close-on-blur is cancelled when starting a search", function() {
-	var ac = $("#autocomplete").autocomplete({
-		source: ["java", "javascript"]
-	}).val("ja").autocomplete("search");
-	same( $(".ui-menu:visible").length, 1 );
-	ac.blur();
-	same( $(".ui-menu:visible").length, 1 );
-	ac.autocomplete("search");
-	stop();
+asyncTest( "close-on-blur is cancelled when starting a search", function() {
+	expect( 3 );
+	var element = $( "#autocomplete" )
+			.autocomplete({
+				source: [ "java", "javascript" ]
+			})
+			.val( "ja" )
+			.autocomplete( "search" ),
+		menu = element.autocomplete( "widget" );
+
+	ok( menu.is( ":visible" ) );
+	element.blur();
+	ok( menu.is( ":visible" ) );
+	element.autocomplete( "search" );
 	setTimeout(function() {
-		same( $(".ui-menu:visible").length, 1 );
+		ok( menu.is( ":visible" ) );
 		start();
-	}, 200);
+	}, 200 );
 });
 
 test( "prevent form submit on enter when menu is active", function() {
-	var event;
-	var ac = $( "#autocomplete" ).autocomplete({
-		source: [ "java", "javascript" ]
-	}).val( "ja" ).autocomplete( "search" );
-	
+	expect( 2 );
+	var event,
+		element = $( "#autocomplete" )
+			.autocomplete({
+				source: [ "java", "javascript" ]
+			})
+			.val( "ja" )
+			.autocomplete( "search" ),
+		menu = element.autocomplete( "widget" );
+
 	event = $.Event( "keydown" );
 	event.keyCode = $.ui.keyCode.DOWN;
-	ac.trigger( event );
-	same( $( ".ui-menu-item:has(.ui-state-focus)" ).length, 1, "menu item is active" );
-	
+	element.trigger( event );
+	deepEqual( menu.find( ".ui-menu-item:has(.ui-state-focus)" ).length, 1, "menu item is active" );
+
 	event = $.Event( "keydown" );
 	event.keyCode = $.ui.keyCode.ENTER;
-	ac.trigger( event );
+	element.trigger( event );
 	ok( event.isDefaultPrevented(), "default action is prevented" );
 });
 
 test( "allow form submit on enter when menu is not active", function() {
-	var event;
-	var ac = $( "#autocomplete" ).autocomplete({
-		autoFocus: false,
-		source: [ "java", "javascript" ]
-	}).val( "ja" ).autocomplete( "search" );
-	
+	expect( 1 );
+	var event,
+		element = $( "#autocomplete" )
+			.autocomplete({
+				autoFocus: false,
+				source: [ "java", "javascript" ]
+			})
+			.val( "ja" )
+			.autocomplete( "search" );
+
 	event = $.Event( "keydown" );
 	event.keyCode = $.ui.keyCode.ENTER;
-	ac.trigger( event );
+	element.trigger( event );
 	ok( !event.isDefaultPrevented(), "default action is prevented" );
 });
 
-})(jQuery);
+}( jQuery ) );