Button: PR Fixup

arschmitz · arschmitz · commit f8b5a6189571 · 2015-04-22T11:14:17.000-04:00
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
@@ -6,7 +6,7 @@
 
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../lib/css.js" data-modules="core button"></script>
-	<script src="../../lib/bootstrap.js" data-widget="button" data-deprecated="true"></script>
+	<script src="../../lib/bootstrap.js" data-widget="button" data-no-back-compat="true"></script>
 </head>
 <body>
 
diff --git a/tests/unit/button/common-deprecated.js b/tests/unit/button/common-deprecated.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "button", {
+define( [
+	"lib/common",
+	"ui/button"
+], function( common ) {
+
+common.testWidget( "button", {
 	defaults: {
 		classes: {
 			"ui-button": "ui-corner-all"
@@ -18,3 +23,5 @@ TestHelpers.commonWidgetTests( "button", {
 		create: null
 	}
 });
+
+} );
diff --git a/tests/unit/button/deprecated.html b/tests/unit/button/deprecated.html
@@ -2,34 +2,10 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title>jQuery UI Button Test Suite</title>
+	<title>jQuery UI Checkboxradio 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",
-			"ui/checkboxradio.js",
-			"ui/controlgroup.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="button_deprecated.js"></script>
-	<script src="button_common_deprecated.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" data-deprecated="true"></script>
 </head>
 <body>
 
diff --git a/tests/unit/button/deprecated.js b/tests/unit/button/deprecated.js
@@ -1,9 +1,7 @@
-/*
- * button_core.js
- */
-
-
-(function($) {
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
 
 module( "Button (deprecated): core" );
 
@@ -30,9 +28,9 @@ test( "Calling buttonset calls controlgroup", function(){
 
 module( "Button (deprecated): methods" );
 
-test( "destroy", function() {
+test( "destroy", function( assert ) {
 	expect( 1 );
-	domEqual( "#checkbox02", function() {
+	assert.domEqual( "#checkbox02", function() {
 		$( "#checkbox02" ).button().button( "destroy" );
 	});
 });
@@ -194,4 +192,4 @@ test( "icon and icons options properly proxied", function(){
 		"Icons secondary option sets iconPosition option to end on init" );
 });
 
-})(jQuery);
+} );
diff --git a/tests/unit/button/methods.js b/tests/unit/button/methods.js
@@ -5,7 +5,7 @@ define( [
 
 module( "Button: methods" );
 
-test( "destroy", function( assert) {
+test( "destroy", function( assert ) {
 	expect( 1 );
 	assert.domEqual( "#button", function() {
 		$( "#button" ).button().button( "destroy" );
diff --git a/ui/button.js b/ui/button.js
@@ -23,7 +23,9 @@
 		define( [
 			"jquery",
 			"./core",
-			"./widget"
+			"./widget",
+			"./controlgroup",
+			"./checkboxradio"
 		], factory );
 	} else {
 
