Skip to content

Commit 669e62d

Browse files
scottgonzalezscottgonzalez
committed
Droppable: Convert tests to new infrastructure
Ref #10119 Ref jquerygh-1528
1 parent a2da340 commit 669e62d

10 files changed

Lines changed: 59 additions & 87 deletions

‎tests/unit/droppable/droppable.html‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,9 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Droppable Test Suite</title>
66

7-
<script src="../../jquery.js"></script>
8-
<script>
9-
$.uiBackCompat = false;
10-
</script>
11-
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
12-
<script src="../../../external/qunit/qunit.js"></script>
13-
<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
14-
<script src="../testsuite.js"></script>
15-
<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
16-
<script>
17-
TestHelpers.loadResources({
18-
css: [ "core" ],
19-
js: [
20-
"ui/core.js",
21-
"ui/widget.js",
22-
"ui/mouse.js",
23-
"ui/draggable.js",
24-
"ui/droppable.js"
25-
]
26-
});
27-
</script>
28-
29-
<script src="droppable_common.js"></script>
30-
<script src="droppable_core.js"></script>
31-
<script src="droppable_events.js"></script>
32-
<script src="droppable_methods.js"></script>
33-
<script src="droppable_options.js"></script>
34-
<script src="droppable_test_helpers.js"></script>
35-
36-
<script src="../swarminject.js"></script>
7+
<script src="../../lib/css.js" data-modules="core"></script>
8+
<script src="../../lib/bootstrap.js" data-widget="droppable"
9+
data-no-back-compat="true"></script>
3710
</head>
3811
<body>
3912

‎tests/unit/droppable/droppable_common.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
TestHelpers.commonWidgetTests( "droppable", {
1+
define( [
2+
"lib/common",
3+
"ui/droppable"
4+
], function( common ) {
5+
6+
common.testWidget( "droppable", {
27
defaults: {
38
accept: "*",
49
addClasses: true,
@@ -17,3 +22,5 @@ TestHelpers.commonWidgetTests( "droppable", {
1722
over: null
1823
}
1924
});
25+
26+
} );

‎tests/unit/droppable/droppable_common_deprecated.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
TestHelpers.commonWidgetTests( "droppable", {
1+
define( [
2+
"lib/common",
3+
"ui/droppable"
4+
], function( common ) {
5+
6+
common.testWidget( "droppable", {
27
defaults: {
38
accept: "*",
49
activeClass: false,
@@ -19,3 +24,5 @@ TestHelpers.commonWidgetTests( "droppable", {
1924
over: null
2025
}
2126
});
27+
28+
} );

‎tests/unit/droppable/droppable_core.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*
2-
* droppable_core.js
3-
*/
4-
5-
(function($) {
1+
define( [
2+
"jquery",
3+
"./droppable_test_helpers",
4+
"ui/droppable"
5+
], function( $, droppableTestHelpers ) {
66

77
module("droppable: core");
88

@@ -20,10 +20,10 @@ test("element types", function() {
2020

2121
(typeName === "table" && el.append("<tr><td>content</td></tr>"));
2222
el.droppable();
23-
TestHelpers.droppable.shouldDrop();
23+
droppableTestHelpers.shouldDrop();
2424
el.droppable("destroy");
2525
el.remove();
2626
});
2727
});
2828

29-
})(jQuery);
29+
} );

‎tests/unit/droppable/droppable_deprecated.html‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,8 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Droppable Test Suite</title>
66

7-
<script src="../../jquery.js"></script>
8-
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
9-
<script src="../../../external/qunit/qunit.js"></script>
10-
<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
11-
<script src="../testsuite.js"></script>
12-
<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
13-
<script>
14-
TestHelpers.loadResources({
15-
css: [ "core" ],
16-
js: [
17-
"ui/core.js",
18-
"ui/widget.js",
19-
"ui/mouse.js",
20-
"ui/draggable.js",
21-
"ui/droppable.js"
22-
]
23-
});
24-
</script>
25-
26-
<script src="droppable_common_deprecated.js"></script>
27-
<script src="droppable_core.js"></script>
28-
<script src="droppable_events.js"></script>
29-
<script src="droppable_methods.js"></script>
30-
<script src="droppable_options.js"></script>
31-
<script src="droppable_test_helpers.js"></script>
32-
33-
<script src="../swarminject.js"></script>
7+
<script src="../../lib/css.js" data-modules="core"></script>
8+
<script src="../../lib/bootstrap.js" data-widget="droppable" data-deprecated="true"></script>
349
</head>
3510
<body>
3611

‎tests/unit/droppable/droppable_deprecated.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
define( function() {} );

‎tests/unit/droppable/droppable_events.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/droppable"
4+
], function( $ ) {
25

36
module( "droppable: events" );
47

@@ -58,4 +61,4 @@ test("drop", function() {
5861
});
5962
*/
6063

61-
})( jQuery );
64+
} );

‎tests/unit/droppable/droppable_methods.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
/*
2-
* droppable_methods.js
3-
*/
4-
(function($) {
1+
define( [
2+
"jquery",
3+
"./droppable_test_helpers",
4+
"ui/droppable"
5+
], function( $, droppableTestHelpers ) {
56

67
module("droppable: methods");
78

@@ -47,16 +48,16 @@ test("enable", function() {
4748
var el, expected, actual;
4849

4950
el = $("#droppable1").droppable({ disabled: true });
50-
TestHelpers.droppable.shouldNotDrop();
51+
droppableTestHelpers.shouldNotDrop();
5152
el.droppable("enable");
52-
TestHelpers.droppable.shouldDrop();
53+
droppableTestHelpers.shouldDrop();
5354
equal(el.droppable("option", "disabled"), false, "disabled option getter");
5455
el.droppable("destroy");
5556
el.droppable({ disabled: true });
56-
TestHelpers.droppable.shouldNotDrop();
57+
droppableTestHelpers.shouldNotDrop();
5758
el.droppable("option", "disabled", false);
5859
equal(el.droppable("option", "disabled"), false, "disabled option setter");
59-
TestHelpers.droppable.shouldDrop();
60+
droppableTestHelpers.shouldDrop();
6061

6162
expected = $("<div></div>").droppable(),
6263
actual = expected.droppable("enable");
@@ -69,23 +70,23 @@ test( "disable", function( assert ) {
6970
var actual, expected,
7071
element = $( "#droppable1" ).droppable({ disabled: false });
7172

72-
TestHelpers.droppable.shouldDrop();
73+
droppableTestHelpers.shouldDrop();
7374
element.droppable( "disable" );
74-
TestHelpers.droppable.shouldNotDrop();
75+
droppableTestHelpers.shouldNotDrop();
7576
equal( element.droppable( "option", "disabled" ), true, "disabled option getter" );
7677
element.droppable( "destroy" );
7778
element.droppable({ disabled: false });
78-
TestHelpers.droppable.shouldDrop();
79+
droppableTestHelpers.shouldDrop();
7980
element.droppable( "option", "disabled", true );
8081
assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" );
8182
ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
8283
assert.hasClasses( element.droppable( "widget" ), "ui-droppable-disabled" );
8384
equal( element.droppable( "option", "disabled" ), true, "disabled option setter" );
84-
TestHelpers.droppable.shouldNotDrop();
85+
droppableTestHelpers.shouldNotDrop();
8586

8687
expected = $( "<div></div>" ).droppable();
8788
actual = expected.droppable( "disable" );
8889
equal( actual, expected, "disable is chainable" );
8990
});
9091

91-
})( jQuery );
92+
} );

‎tests/unit/droppable/droppable_options.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
/*
2-
* droppable_options.js
3-
*/
4-
(function($) {
1+
define( [
2+
"jquery",
3+
"./droppable_test_helpers",
4+
"ui/droppable"
5+
], function( $ ) {
56

67
module( "droppable: options" );
78

@@ -202,4 +203,4 @@ test( "tolerance, touch", function() {
202203
ok(false, 'missing test - untested code is broken code');
203204
});
204205
*/
205-
})(jQuery);
206+
} );

‎tests/unit/droppable/droppable_test_helpers.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
TestHelpers.droppable = {
1+
define( function() {
2+
3+
return {
24
shouldDrop: function() {
35
// todo: actually implement this
46
ok(true, "missing test - untested code is broken code");
@@ -8,3 +10,5 @@ TestHelpers.droppable = {
810
ok(true, "missing test - untested code is broken code");
911
}
1012
};
13+
14+
} );

0 commit comments

Comments
 (0)