Skip to content

Commit 7655302

Browse files
rxaviersrxaviers
committed
(fix) Tests: Replace resource loader with AMD
- Port all others;
1 parent bc593d3 commit 7655302

File tree

9 files changed

+62
-36
lines changed

9 files changed

+62
-36
lines changed

‎tests/unit/droppable/droppable_common.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
define([
2-
"helper/testsuite"
2+
"helper/testsuite",
3+
"ui/droppable"
34
], function( testHelper ) {
45

56
testHelper.commonWidgetTests( "droppable", {

‎tests/unit/droppable/droppable_events.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
define([
22
"jquery",
3-
"ui/droppable"
3+
"ui/droppable",
4+
"jquery.simulate"
45
], function( $ ) {
56

67
module( "droppable: events" );

‎tests/unit/droppable/droppable_methods.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
define([
22
"jquery",
3+
"./droppable_test_helpers",
34
"ui/droppable"
4-
], function( $ ) {
5+
], function( $, droppableTestHelper ) {
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+
droppableTestHelper.shouldNotDrop();
5152
el.droppable("enable");
52-
TestHelpers.droppable.shouldDrop();
53+
droppableTestHelper.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+
droppableTestHelper.shouldNotDrop();
5758
el.droppable("option", "disabled", false);
5859
equal(el.droppable("option", "disabled"), false, "disabled option setter");
59-
TestHelpers.droppable.shouldDrop();
60+
droppableTestHelper.shouldDrop();
6061

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

72-
TestHelpers.droppable.shouldDrop();
73+
droppableTestHelper.shouldDrop();
7374
element.droppable( "disable" );
74-
TestHelpers.droppable.shouldNotDrop();
75+
droppableTestHelper.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+
droppableTestHelper.shouldDrop();
7980
element.droppable( "option", "disabled", true );
8081
ok( !element.droppable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
8182
ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
8283
ok( element.droppable( "widget" ).hasClass( "ui-droppable-disabled" ), "element gets ui-droppable-disabled" );
8384
equal( element.droppable( "option", "disabled" ), true, "disabled option setter" );
84-
TestHelpers.droppable.shouldNotDrop();
85+
droppableTestHelper.shouldNotDrop();
8586

8687
expected = $( "<div></div>" ).droppable();
8788
actual = expected.droppable( "disable" );

‎tests/unit/effects/effects_core.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
define([
22
"jquery",
3-
"ui/effect"
4-
], function( $ ) {
3+
"helper/testsuite",
4+
"ui/effect-blind",
5+
"ui/effect-bounce",
6+
"ui/effect-clip",
7+
"ui/effect-drop",
8+
"ui/effect-explode",
9+
"ui/effect-fade",
10+
"ui/effect-fold",
11+
"ui/effect-highlight",
12+
"ui/effect",
13+
"ui/effect-puff",
14+
"ui/effect-pulsate",
15+
"ui/effect-scale",
16+
"ui/effect-shake",
17+
"ui/effect-size",
18+
"ui/effect-slide",
19+
"ui/effect-transfer"
20+
], function( $, testHelper ) {
521

622
function present( value, array, message ) {
723
QUnit.push( jQuery.inArray( value, array ) !== -1 , value, array, message );
@@ -220,7 +236,7 @@ asyncTest( "animateClass: css and class changes during animation are not lost (#
220236
$.each( $.effects.effect, function( effect ) {
221237
module( "effects." + effect );
222238

223-
TestHelpers.testJshint( "effect-" + effect );
239+
testHelper.testJshint( "effect-" + effect );
224240

225241
if ( effect === "transfer" ) {
226242
return;

‎tests/unit/menu/menu_common.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
define([
2-
"helper/testsuite"
2+
"helper/testsuite",
3+
"ui/menu"
34
], function( testHelper ) {
45

56
testHelper.commonWidgetTests( "menu", {

‎tests/unit/menu/menu_core.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
define([
22
"jquery",
3+
"./menu_test_helpers",
34
"ui/menu"
4-
], function( $ ) {
5+
], function( $, menuTestHelper ) {
56

67
module( "menu: core" );
78

@@ -40,7 +41,7 @@ asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", functio
4041
$( "#test9044" ).focus();
4142
});
4243

43-
TestHelpers.menu.click( element, "3" );
44+
menuTestHelper.click( element, "3" );
4445
setTimeout( function() {
4546
equal( document.activeElement.id, "test9044", "Focus was swallowed by menu" );
4647
$( "#test9044" ).remove();

‎tests/unit/menu/menu_events.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
define([
22
"jquery",
3+
"./menu_test_helpers",
4+
"jquery.simulate",
35
"ui/menu"
4-
], function( $ ) {
6+
], function( $, menuTestHelper ) {
57

6-
var log = TestHelpers.menu.log,
7-
logOutput = TestHelpers.menu.logOutput,
8-
click = TestHelpers.menu.click;
8+
var log = menuTestHelper.log,
9+
logOutput = menuTestHelper.logOutput,
10+
click = menuTestHelper.click;
911

1012
module( "menu: events", {
1113
setup: function() {
12-
TestHelpers.menu.clearLog();
14+
menuTestHelper.clearLog();
1315
}
1416
});
1517

‎tests/unit/menu/menu_methods.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
define([
22
"jquery",
3+
"helper/testsuite",
4+
"./menu_test_helpers",
35
"ui/menu"
4-
], function( $ ) {
6+
], function( $, testHelper, menuTestHelper ) {
57

6-
var log = TestHelpers.menu.log,
7-
logOutput = TestHelpers.menu.logOutput,
8-
click = TestHelpers.menu.click;
8+
var log = menuTestHelper.log,
9+
logOutput = menuTestHelper.logOutput,
10+
click = menuTestHelper.click;
911

1012
module( "menu: methods", {
1113
setup: function() {
12-
TestHelpers.menu.clearLog();
14+
menuTestHelper.clearLog();
1315
}
1416
});
1517

1618
test( "destroy", function() {
1719
expect( 4 );
18-
domEqual( "#menu1", function() {
20+
testHelper.domEqual( "#menu1", function() {
1921
$( "#menu1" ).menu().menu( "destroy" );
2022
});
21-
domEqual( "#menu2", function() {
23+
testHelper.domEqual( "#menu2", function() {
2224
$( "#menu2" ).menu().menu( "destroy" );
2325
});
24-
domEqual( "#menu5", function() {
26+
testHelper.domEqual( "#menu5", function() {
2527
$( "#menu5").menu().menu( "destroy" );
2628
});
27-
domEqual( "#menu6", function() {
29+
testHelper.domEqual( "#menu6", function() {
2830
$( "#menu6" ).menu().menu( "destroy" );
2931
});
3032
});

‎tests/unit/menu/menu_options.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
define([
22
"jquery",
3+
"./menu_test_helpers",
34
"ui/menu"
4-
], function( $ ) {
5+
], function( $, menuTestHelper ) {
56

6-
var log = TestHelpers.menu.log,
7-
logOutput = TestHelpers.menu.logOutput,
8-
click = TestHelpers.menu.click;
7+
var log = menuTestHelper.log,
8+
logOutput = menuTestHelper.logOutput,
9+
click = menuTestHelper.click;
910

1011
module( "menu: options", {
1112
setup: function() {
12-
TestHelpers.menu.clearLog();
13+
menuTestHelper.clearLog();
1314
}
1415
});
1516

0 commit comments

Comments
 (0)