Merge branch 'master' into selectmenu

4 files changed, 19 insertions, 16 deletions

diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html
index 6e410dbb3..a136d8c25 100644
--- a/tests/unit/autocomplete/all.html
+++ b/tests/unit/autocomplete/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete Test Suite</title>
 
-	<script src="../../../jquery-1.6.2.js"></script>
+	<script src="../../../jquery-1.7.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index e5987350b..70d2ecfd1 100644
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -4,15 +4,20 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.autocomplete.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
-	<script src="../../../ui/jquery.ui.menu.js"></script>
-	<script src="../../../ui/jquery.ui.autocomplete.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.menu", "ui.autocomplete" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.position.js",
+			"ui/jquery.ui.menu.js",
+			"ui/jquery.ui.autocomplete.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index 6813cfa71..286d902f1 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -56,21 +56,19 @@ $.each([
 					},
 					change: function( event, ui ) {
 						equal( event.originalEvent.type, "blur", "change originalEvent" );
-						deepEqual( ui.item, { label: "Java", value: "Java" }, "chnage ui.item" );
+						deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" );
 						ok( menu.is( ":hidden" ), "menu closed on change" );
 						start();
 					}
 				}),
 			menu = element.autocomplete( "widget" );
-	
-		element.focus()[ settings.valueMethod ]( "j" ).keydown();
+
+		element.simulate( "focus" )[ settings.valueMethod ]( "j" ).keydown();
 		setTimeout(function() {
 			ok( menu.is( ":visible" ), "menu is visible after delay" );
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-			// blurring through jQuery causes a bug in IE 6 which causes the
-			// autocompletechange event to occur twice
-			element[0].blur();
+			element.simulate( "blur" );
 		}, 50 );
 	});
 });
diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js
index 8d11aa399..114e9a42b 100644
--- a/tests/unit/autocomplete/autocomplete_options.js
+++ b/tests/unit/autocomplete/autocomplete_options.js
@@ -34,7 +34,7 @@ function autoFocusTest( afValue, focusedLength ) {
 		delay: 0,
 		source: data,
 		open: function( event, ui ) {
-			equal( element.autocomplete( "widget" ).children( ".ui-menu-item:first .ui-state-focus" ).length,
+			equal( element.autocomplete( "widget" ).children( ".ui-menu-item:first" ).find( ".ui-state-focus" ).length,
 				focusedLength, "first item is " + (afValue ? "" : "not") + " auto focused" );
 			start();
 		}