From: Scott González Date: Mon, 6 Apr 2015 18:38:11 +0000 (-0400) Subject: Selectable: Convert tests to new infrastructure X-Git-Tag: 1.12.0-beta.1~324 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b8625346f6de6d7533493fc27b24d8acd45aa84c;p=jquery-ui.git Selectable: Convert tests to new infrastructure Ref #10119 Ref gh-1528 --- diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html index 024d28911..4486084e4 100644 --- a/tests/unit/selectable/selectable.html +++ b/tests/unit/selectable/selectable.html @@ -4,31 +4,8 @@ jQuery UI Selectable Test Suite - - - - - - - - - - - - - - - + + diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js index 79bf6e3c5..9a14e6df5 100644 --- 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 index 5df7f2f5b..6eb99f325 100644 --- 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 index 02c9ab075..045809670 100644 --- 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 index 292c0cf96..cdbfb4aab 100644 --- 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); +} );