Widget: Convert tests to new infrastructure

Ref #10119 Ref gh-1528
jquery · Apr 9, 2015 · 23a7a113ac61bb12ad6a3775553d5ac1426f82f6 · 23a7a11
1 parent 94f5c15
commit 23a7a113ac61bb12ad6a3775553d5ac1426f82f6
Showing with 33 additions and 29 deletions.

+8 −20 tests/unit/widget/widget.html

+6 −0 tests/unit/widget/widget_animation.js

+7 −4 tests/unit/widget/widget_classes.js

+7 −3 tests/unit/widget/widget_core.js

+5 −2 tests/unit/widget/widget_extend.js
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
@@ -4,27 +4,15 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Widget 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" ],
-		js: [
-			"ui/widget.js"
-		]
-	});
+	<script src="../../lib/css.js" data-modules="core"></script>
+	<script src="../../lib/bootstrap.js"
+		data-modules="
+			widget_core
+			widget_extend
+			widget_animation
+			widget_classes
+		">
 	</script>
-
-	<script src="widget_core.js"></script>
-	<script src="widget_extend.js"></script>
-	<script src="widget_animation.js"></script>
-	<script src="widget_classes.js"></script>
-
-	<script src="../swarminject.js"></script>
 </head>
 <body>
 

diff --git a/tests/unit/widget/widget_animation.js b/tests/unit/widget/widget_animation.js
@@ -1,3 +1,7 @@
+define( [
+	"jquery",
+	"ui/widget"
+], function( $ ) {
 
 module( "widget animation", (function() {
 	var show = $.fn.show,
@@ -255,3 +259,5 @@ asyncTest( "show: object(effect)", function() {
 			next();
 		});
 });
+
+} );
diff --git a/tests/unit/widget/widget_classes.js b/tests/unit/widget/widget_classes.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/widget"
+], function( $ ) {
 
 module( "widget factory classes", {
 	setup: function() {
@@ -115,10 +118,10 @@ test( ".option() - classes setter", function( assert ) {
 		"Appending a class to the current value works as expected" );
 });
 
-test( ".destroy() - class removal", function() {
+test( ".destroy() - class removal", function( assert ) {
 	expect( 1 );
 
-	domEqual( "#widget", function() {
+	assert.domEqual( "#widget", function() {
 		$( "#widget" ).classesWidget().classesWidget( "destroy" );
 	});
 });
@@ -140,4 +143,4 @@ test( "._add/_remove/_toggleClass()", function( assert ) {
 	elementLacksClasses( widget, "remove", assert );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
@@ -1,4 +1,8 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"lib/common",
+	"ui/widget"
+], function( $, common ) {
 
 module( "widget factory", {
 	teardown: function() {
@@ -9,7 +13,7 @@ module( "widget factory", {
 	}
 });
 
-TestHelpers.testJshint( "widget" );
+common.testJshint( "widget" );
 
 test( "widget creation", function() {
 	expect( 5 );
@@ -1507,4 +1511,4 @@ test( "$.widget.bridge() - widgetFullName", function() {
 	equal( typeof instance, "object", "instance stored in .data(widgetFullName)" );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/widget_extend.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+	"jquery",
+	"ui/widget"
+], function( $ ) {
 
 test( "$.widget.extend()", function() {
 	expect( 27 );
@@ -106,4 +109,4 @@ test( "$.widget.extend()", function() {
 	deepEqual( input, output, "don't clone arrays" );
 });
 
-}( jQuery ));
+} );