Selectable: Convert tests to new infrastructure

scottgonzalez · scottgonzalez · commit b8625346f6de · 2015-04-09T09:26:26.000-04:00
Ref #10119 Ref jquerygh-1528
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
@@ -4,31 +4,8 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectable 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", "selectable" ],
-		js: [
-			"ui/core.js",
-			"ui/widget.js",
-			"ui/mouse.js",
-			"ui/selectable.js"
-		]
-	});
-	</script>
-
-	<script src="selectable_common.js"></script>
-	<script src="selectable_core.js"></script>
-	<script src="selectable_events.js"></script>
-	<script src="selectable_methods.js"></script>
-	<script src="selectable_options.js"></script>
-
-	<script src="../swarminject.js"></script>
+	<script src="../../lib/css.js" data-modules="core selectable"></script>
+	<script src="../../lib/bootstrap.js" data-widget="selectable"></script>
 </head>
 <body>
 
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests("selectable", {
+define( [
+	"lib/common",
+	"ui/selectable"
+], function( common ) {
+
+common.testWidget( "selectable", {
 	defaults: {
 		appendTo: "body",
 		autoRefresh: true,
@@ -20,3 +25,5 @@ TestHelpers.commonWidgetTests("selectable", {
 		unselecting: null
 	}
 });
+
+} );
diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js
@@ -1,7 +1,8 @@
-/*
- * selectable_events.js
- */
-(function( $ ) {
+define( [
+	"jquery",
+	"lib/helper",
+	"ui/selectable"
+], function( $, testHelpers ) {
 
 module("selectable: events");
 
@@ -40,7 +41,7 @@ test( "mousedown: initial position of helper", function() {
 
 	var helperOffset,
 		element = $( "#selectable1" ).selectable(),
-		contentToForceScroll = TestHelpers.forceScrollableWindow( "body" );
+		contentToForceScroll = testHelpers.forceScrollableWindow( "body" );
 
 	$( window ).scrollTop( 100 ).scrollLeft( 100 );
 
@@ -59,4 +60,4 @@ test( "mousedown: initial position of helper", function() {
 	$( window ).scrollTop( 0 ).scrollLeft( 0 );
 });
 
-})( jQuery );
+} );
diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js
@@ -1,7 +1,7 @@
-/*
- * selectable_methods.js
- */
-(function($) {
+define( [
+	"jquery",
+	"ui/selectable"
+], function( $ ) {
 
 module("selectable: methods");
 
@@ -108,4 +108,4 @@ test( "disable", function( assert ) {
 	equal( chainable, element, "disable is chainable" );
 });
 
-})(jQuery);
+} );
diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js
@@ -1,7 +1,7 @@
-/*
- * selectable_options.js
- */
-(function($) {
+define( [
+	"jquery",
+	"ui/selectable"
+], function( $ ) {
 
 module("selectable: options");
 
@@ -61,4 +61,4 @@ test("filter", function() {
 	el.selectable("destroy");
 });
 
-})(jQuery);
+} );
