Selectmenu: Convert tests to new infrastructure

scottgonzalez · scottgonzalez · commit 3522fd9618d1 · 2015-04-09T09:26:26.000-04:00
Ref #10119 Ref jquerygh-1528
diff --git a/tests/unit/selectmenu/selectmenu.html b/tests/unit/selectmenu/selectmenu.html
@@ -4,32 +4,8 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectmenu 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" , "selectmenu" ],
-		js: [
-			"ui/core.js",
-			"ui/widget.js",
-			"ui/position.js",
-			"ui/menu.js",
-			"ui/selectmenu.js"
-		]
-	});
-	</script>
-
-	<script src="selectmenu_common.js"></script>
-	<script src="selectmenu_core.js"></script>
-	<script src="selectmenu_events.js"></script>
-	<script src="selectmenu_methods.js"></script>
-	<script src="selectmenu_options.js"></script>
-
-	<script src="../swarminject.js"></script>
+	<script src="../../lib/css.js" data-modules="core menu selectmenu"></script>
+	<script src="../../lib/bootstrap.js" data-widget="selectmenu"></script>
 </head>
 <body>
 
diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "selectmenu", {
+define( [
+	"lib/common",
+	"ui/selectmenu"
+], function( common ) {
+
+common.testWidget( "selectmenu", {
 	defaults: {
 		appendTo: null,
 		classes: {
@@ -25,3 +30,5 @@ TestHelpers.commonWidgetTests( "selectmenu", {
 		select: null
 	}
 });
+
+} );
diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/selectmenu_core.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
 
 module( "selectmenu: core" );
 
@@ -326,4 +329,4 @@ $.each([
 	});
 });
 
-})( jQuery );
+} );
diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js
@@ -1,4 +1,7 @@
-(function ( $ ) {
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
 
 module( "selectmenu: events", {
 	setup: function() {
@@ -130,4 +133,4 @@ asyncTest( "select", function() {
 	});
 });
 
-})( jQuery );
+} );
diff --git a/tests/unit/selectmenu/selectmenu_methods.js b/tests/unit/selectmenu/selectmenu_methods.js
@@ -1,10 +1,13 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
 
 module( "selectmenu: methods" );
 
-test( "destroy", function() {
+test( "destroy", function( assert ) {
 	expect( 1 );
-	domEqual( "#speed", function() {
+	assert.domEqual( "#speed", function() {
 		$( "#speed" ).selectmenu().selectmenu( "destroy" );
 	});
 });
@@ -183,4 +186,4 @@ test( "widget and menuWidget", function( assert ) {
 	ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" );
 });
 
-})( jQuery );
+} );
diff --git a/tests/unit/selectmenu/selectmenu_options.js b/tests/unit/selectmenu/selectmenu_options.js
@@ -1,4 +1,7 @@
-(function ( $ ) {
+define( [
+	"jquery",
+	"ui/selectmenu"
+], function( $ ) {
 
 module( "selectmenu: options" );
 
@@ -122,4 +125,4 @@ test( "width", function() {
 	equal( button.outerWidth(), 300, "button width fills container" );
 });
 
-})( jQuery );
+} );
