Autocomplete: Convert tests to new infrastructure

scottgonzalez · scottgonzalez · commit aff3c32ee1f0 · 2015-04-09T09:24:45.000-04:00
Ref #10119 Ref jquerygh-1528
diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
@@ -4,32 +4,8 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete Test Suite</title>
 
-	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
-	<script>
-	TestHelpers.loadResources({
-		css: [ "core", "menu", "autocomplete" ],
-		js: [
-			"ui/core.js",
-			"ui/widget.js",
-			"ui/position.js",
-			"ui/menu.js",
-			"ui/autocomplete.js"
-		]
-	});
-	</script>
-
-	<script src="autocomplete_common.js"></script>
-	<script src="autocomplete_core.js"></script>
-	<script src="autocomplete_events.js"></script>
-	<script src="autocomplete_methods.js"></script>
-	<script src="autocomplete_options.js"></script>
-
-	<script src="../swarminject.js"></script>
+	<script src="../../lib/css.js" data-modules="core menu autocomplete"></script>
+	<script src="../../lib/bootstrap.js" data-widget="autocomplete"></script>
 </head>
 <body>
 
diff --git a/tests/unit/autocomplete/autocomplete_common.js b/tests/unit/autocomplete/autocomplete_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "autocomplete", {
+define( [
+	"lib/common",
+	"ui/autocomplete"
+], function( common ) {
+
+common.testWidget( "autocomplete", {
 	defaults: {
 		appendTo: null,
 		autoFocus: false,
@@ -28,3 +33,5 @@ TestHelpers.commonWidgetTests( "autocomplete", {
 		select: null
 	}
 });
+
+} );
diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
 
 module( "autocomplete: core" );
 
@@ -395,4 +398,4 @@ asyncTest( "Search if the user retypes the same value (#7434)", function() {
 	});
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
 
 module( "autocomplete: events" );
 
@@ -179,4 +182,4 @@ asyncTest( "blur during remote search", function() {
 	ac.val( "ro" ).keydown();
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/autocomplete/autocomplete_methods.js b/tests/unit/autocomplete/autocomplete_methods.js
@@ -1,10 +1,13 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
 
 module( "autocomplete: methods" );
 
-test( "destroy", function() {
+test( "destroy", function( assert ) {
 	expect( 1 );
-	domEqual( "#autocomplete", function() {
+	assert.domEqual( "#autocomplete", function() {
 		$( "#autocomplete" ).autocomplete().autocomplete( "destroy" );
 	});
 });
@@ -42,4 +45,4 @@ test( "widget", function( assert ) {
 	assert.hasClasses( widgetElement, "ui-menu" );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/autocomplete"
+], function( $ ) {
 
 module( "autocomplete: options" );
 
@@ -311,4 +314,4 @@ test( "source, update after init", function() {
 	equal( menu.find( ".ui-menu-item" ).text(), "php" );
 });
 
-}( jQuery ) );
+} );
