Button: Convert tests to new infrastructure

scottgonzalez · scottgonzalez · commit f908a7793bf9 · 2015-04-09T09:24:45.000-04:00
Ref #10119 Ref jquerygh-1528
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
@@ -4,30 +4,8 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button 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", "button" ],
-		js: [
-			"ui/core.js",
-			"ui/widget.js",
-			"ui/button.js"
-		]
-	});
-	</script>
-
-	<script src="button_common.js"></script>
-	<script src="button_core.js"></script>
-	<script src="button_events.js"></script>
-	<script src="button_methods.js"></script>
-	<script src="button_options.js"></script>
-
-	<script src="../swarminject.js"></script>
+	<script src="../../lib/css.js" data-modules="core button"></script>
+	<script src="../../lib/bootstrap.js" data-widget="button"></script>
 </head>
 <body>
 
diff --git a/tests/unit/button/button_common.js b/tests/unit/button/button_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "button", {
+define( [
+	"lib/common",
+	"ui/button"
+], function( common ) {
+
+common.testWidget( "button", {
 	defaults: {
 		classes: {},
 		disabled: null,
@@ -13,3 +18,5 @@ TestHelpers.commonWidgetTests( "button", {
 		create: null
 	}
 });
+
+} );
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.js
@@ -1,8 +1,7 @@
-/*
- * button_core.js
- */
-
-(function($) {
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
 
 module("button: core");
 
@@ -228,4 +227,4 @@ asyncTest( "#9169 - Disabled button maintains ui-state-focus", function( assert
 	});
 });
 
-})(jQuery);
+} );
diff --git a/tests/unit/button/button_events.js b/tests/unit/button/button_events.js
@@ -1,7 +1,7 @@
-/*
- * button_events.js
- */
-(function($) {
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
 
 module("button: events");
 
@@ -33,4 +33,4 @@ asyncTest( "when button loses focus, ensure active state is removed (#8559)", fu
 	});
 });
 
-})(jQuery);
+} );
diff --git a/tests/unit/button/button_methods.js b/tests/unit/button/button_methods.js
@@ -1,13 +1,13 @@
-/*
- * button_methods.js
- */
-(function($) {
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
 
 module("button: methods");
 
-test("destroy", function() {
+test("destroy", function( assert ) {
 	expect( 1 );
-	domEqual( "#button", function() {
+	assert.domEqual( "#button", function() {
 		$( "#button" ).button().button( "destroy" );
 	});
 });
@@ -70,4 +70,4 @@ test( "refresh: buttonset should turn added elements into button widgets", funct
 	equal( checkboxButtonset.find( ":ui-button" ).length, 4, "checkbox" );
 });
 
-})(jQuery);
+} );
diff --git a/tests/unit/button/button_options.js b/tests/unit/button/button_options.js
@@ -1,7 +1,7 @@
-/*
- * button_options.js
- */
-(function($) {
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
 
 module( "button: options" );
 
@@ -154,4 +154,4 @@ test( "#5295 - button does not remove hoverstate if disabled" , function( assert
 	assert.lacksClasses( btn, "ui-state-hover" );
 });
 
-})(jQuery);
+} );
