diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html index 4fc712a009..9021f8c780 100644 --- a/tests/unit/droppable/droppable.html +++ b/tests/unit/droppable/droppable.html @@ -4,36 +4,9 @@ jQuery UI Droppable Test Suite - - - - - - - - - - - - - - - - - + + diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js index 87d3ca1dba..ef8e116922 100644 --- a/tests/unit/droppable/droppable_common.js +++ b/tests/unit/droppable/droppable_common.js @@ -1,4 +1,9 @@ -TestHelpers.commonWidgetTests( "droppable", { +define( [ + "lib/common", + "ui/droppable" +], function( common ) { + +common.testWidget( "droppable", { defaults: { accept: "*", addClasses: true, @@ -17,3 +22,5 @@ TestHelpers.commonWidgetTests( "droppable", { over: null } }); + +} ); diff --git a/tests/unit/droppable/droppable_common_deprecated.js b/tests/unit/droppable/droppable_common_deprecated.js index bd56aa35f9..9d2f6c6b66 100644 --- a/tests/unit/droppable/droppable_common_deprecated.js +++ b/tests/unit/droppable/droppable_common_deprecated.js @@ -1,4 +1,9 @@ -TestHelpers.commonWidgetTests( "droppable", { +define( [ + "lib/common", + "ui/droppable" +], function( common ) { + +common.testWidget( "droppable", { defaults: { accept: "*", activeClass: false, @@ -19,3 +24,5 @@ TestHelpers.commonWidgetTests( "droppable", { over: null } }); + +} ); diff --git a/tests/unit/droppable/droppable_core.js b/tests/unit/droppable/droppable_core.js index 53b08fd856..9ea789544e 100644 --- a/tests/unit/droppable/droppable_core.js +++ b/tests/unit/droppable/droppable_core.js @@ -1,8 +1,8 @@ -/* - * droppable_core.js - */ - -(function($) { +define( [ + "jquery", + "./droppable_test_helpers", + "ui/droppable" +], function( $, droppableTestHelpers ) { module("droppable: core"); @@ -20,10 +20,10 @@ test("element types", function() { (typeName === "table" && el.append("content")); el.droppable(); - TestHelpers.droppable.shouldDrop(); + droppableTestHelpers.shouldDrop(); el.droppable("destroy"); el.remove(); }); }); -})(jQuery); +} ); diff --git a/tests/unit/droppable/droppable_deprecated.html b/tests/unit/droppable/droppable_deprecated.html index 5af53a2f7b..e47b41c6bf 100644 --- a/tests/unit/droppable/droppable_deprecated.html +++ b/tests/unit/droppable/droppable_deprecated.html @@ -4,33 +4,8 @@ jQuery UI Droppable Test Suite - - - - - - - - - - - - - - - - + + diff --git a/tests/unit/droppable/droppable_deprecated.js b/tests/unit/droppable/droppable_deprecated.js new file mode 100644 index 0000000000..3931f5f06c --- /dev/null +++ b/tests/unit/droppable/droppable_deprecated.js @@ -0,0 +1 @@ +define( function() {} ); diff --git a/tests/unit/droppable/droppable_events.js b/tests/unit/droppable/droppable_events.js index 1b205bc973..a60d9292ee 100644 --- a/tests/unit/droppable/droppable_events.js +++ b/tests/unit/droppable/droppable_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define( [ + "jquery", + "ui/droppable" +], function( $ ) { module( "droppable: events" ); @@ -58,4 +61,4 @@ test("drop", function() { }); */ -})( jQuery ); +} ); diff --git a/tests/unit/droppable/droppable_methods.js b/tests/unit/droppable/droppable_methods.js index aebaf490c7..70a60d2cbc 100644 --- a/tests/unit/droppable/droppable_methods.js +++ b/tests/unit/droppable/droppable_methods.js @@ -1,7 +1,8 @@ -/* - * droppable_methods.js - */ -(function($) { +define( [ + "jquery", + "./droppable_test_helpers", + "ui/droppable" +], function( $, droppableTestHelpers ) { module("droppable: methods"); @@ -47,16 +48,16 @@ test("enable", function() { var el, expected, actual; el = $("#droppable1").droppable({ disabled: true }); - TestHelpers.droppable.shouldNotDrop(); + droppableTestHelpers.shouldNotDrop(); el.droppable("enable"); - TestHelpers.droppable.shouldDrop(); + droppableTestHelpers.shouldDrop(); equal(el.droppable("option", "disabled"), false, "disabled option getter"); el.droppable("destroy"); el.droppable({ disabled: true }); - TestHelpers.droppable.shouldNotDrop(); + droppableTestHelpers.shouldNotDrop(); el.droppable("option", "disabled", false); equal(el.droppable("option", "disabled"), false, "disabled option setter"); - TestHelpers.droppable.shouldDrop(); + droppableTestHelpers.shouldDrop(); expected = $("
").droppable(), actual = expected.droppable("enable"); @@ -69,23 +70,23 @@ test( "disable", function( assert ) { var actual, expected, element = $( "#droppable1" ).droppable({ disabled: false }); - TestHelpers.droppable.shouldDrop(); + droppableTestHelpers.shouldDrop(); element.droppable( "disable" ); - TestHelpers.droppable.shouldNotDrop(); + droppableTestHelpers.shouldNotDrop(); equal( element.droppable( "option", "disabled" ), true, "disabled option getter" ); element.droppable( "destroy" ); element.droppable({ disabled: false }); - TestHelpers.droppable.shouldDrop(); + droppableTestHelpers.shouldDrop(); element.droppable( "option", "disabled", true ); assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" ); ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" ); assert.hasClasses( element.droppable( "widget" ), "ui-droppable-disabled" ); equal( element.droppable( "option", "disabled" ), true, "disabled option setter" ); - TestHelpers.droppable.shouldNotDrop(); + droppableTestHelpers.shouldNotDrop(); expected = $( "
" ).droppable(); actual = expected.droppable( "disable" ); equal( actual, expected, "disable is chainable" ); }); -})( jQuery ); +} ); diff --git a/tests/unit/droppable/droppable_options.js b/tests/unit/droppable/droppable_options.js index 9a4be076d1..24a1a788ea 100644 --- a/tests/unit/droppable/droppable_options.js +++ b/tests/unit/droppable/droppable_options.js @@ -1,7 +1,8 @@ -/* - * droppable_options.js - */ -(function($) { +define( [ + "jquery", + "./droppable_test_helpers", + "ui/droppable" +], function( $ ) { module( "droppable: options" ); @@ -202,4 +203,4 @@ test( "tolerance, touch", function() { ok(false, 'missing test - untested code is broken code'); }); */ -})(jQuery); +} ); diff --git a/tests/unit/droppable/droppable_test_helpers.js b/tests/unit/droppable/droppable_test_helpers.js index ce972be634..5ffb32f4c6 100644 --- a/tests/unit/droppable/droppable_test_helpers.js +++ b/tests/unit/droppable/droppable_test_helpers.js @@ -1,4 +1,6 @@ -TestHelpers.droppable = { +define( function() { + +return { shouldDrop: function() { // todo: actually implement this ok(true, "missing test - untested code is broken code"); @@ -8,3 +10,5 @@ TestHelpers.droppable = { ok(true, "missing test - untested code is broken code"); } }; + +} );