Progressbar: Convert tests to new infrastructure

scottgonzalez · scottgonzalez · commit df3e8c4deb07 · 2015-04-09T09:26:26.000-04:00
Ref #10119 Ref gh-1528
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
@@ -4,30 +4,8 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar 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", "progressbar" ],
-		js: [
-			"ui/core.js",
-			"ui/widget.js",
-			"ui/progressbar.js"
-		]
-	});
-	</script>
-
-	<script src="progressbar_common.js"></script>
-	<script src="progressbar_core.js"></script>
-	<script src="progressbar_events.js"></script>
-	<script src="progressbar_methods.js"></script>
-	<script src="progressbar_options.js"></script>
-
-	<script src="../swarminject.js"></script>
+	<script src="../../lib/css.js" data-modules="core progressbar"></script>
+	<script src="../../lib/bootstrap.js" data-widget="progressbar"></script>
 </head>
 <body>
 
diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/progressbar_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "progressbar", {
+define( [
+	"lib/common",
+	"ui/progressbar"
+], function( common ) {
+
+common.testWidget( "progressbar", {
 	defaults: {
 		classes: {
 			"ui-progressbar": "ui-corner-all",
@@ -15,3 +20,5 @@ TestHelpers.commonWidgetTests( "progressbar", {
 		create: null
 	}
 });
+
+} );
diff --git a/tests/unit/progressbar/progressbar_core.js b/tests/unit/progressbar/progressbar_core.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
 
 module( "progressbar: core" );
 
@@ -58,4 +61,4 @@ test( "accessibility", function() {
 	equal( element.attr( "aria-valuenow" ), null, "aria-valuenow" );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/progressbar/progressbar_events.js b/tests/unit/progressbar/progressbar_events.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
 
 module( "progressbar: events" );
 
@@ -52,4 +55,4 @@ test( "complete", function() {
 	element.progressbar( "value", value );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/progressbar/progressbar_methods.js b/tests/unit/progressbar/progressbar_methods.js
@@ -1,10 +1,13 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
 
 module( "progressbar: methods" );
 
-test( "destroy", function() {
+test( "destroy", function( assert ) {
 	expect( 1 );
-	domEqual( "#progressbar", function() {
+	assert.domEqual( "#progressbar", function() {
 		$( "#progressbar" ).progressbar().progressbar( "destroy" );
 	});
 });
@@ -36,4 +39,4 @@ test( "widget", function() {
 	strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/progressbar/progressbar_options.js b/tests/unit/progressbar/progressbar_options.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/progressbar"
+], function( $ ) {
 
 module( "progressbar: options" );
 
@@ -73,4 +76,4 @@ test( "change max below value", function() {
 		"value constrained at max" );
 });
 
-}( jQuery ) );
+} );
