Skip to content

Commit 4e7407c

Browse files
scottgonzalezscottgonzalez
committed
Resizable: Convert tests to new infrastructure
Ref #10119 Ref gh-1528
1 parent df3e8c4 commit 4e7407c

File tree

7 files changed

+121
-133
lines changed

7 files changed

+121
-133
lines changed

‎tests/unit/resizable/resizable.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 Resizable 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", "resizable" ],
16-
js: [
17-
"ui/core.js",
18-
"ui/widget.js",
19-
"ui/mouse.js",
20-
"ui/resizable.js"
21-
]
22-
});
23-
</script>
24-
25-
<script src="resizable_common.js"></script>
26-
<script src="resizable_core.js"></script>
27-
<script src="resizable_events.js"></script>
28-
<script src="resizable_methods.js"></script>
29-
<script src="resizable_options.js"></script>
30-
<script src="resizable_test_helpers.js"></script>
31-
32-
<script src="../swarminject.js"></script>
33-
7+
<script src="../../lib/css.js" data-modules="core resizable"></script>
8+
<script src="../../lib/bootstrap.js" data-widget="resizable"></script>
349
<style>
3510
#container {
3611
width: 300px;

‎tests/unit/resizable/resizable_common.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
TestHelpers.commonWidgetTests( "resizable", {
1+
define( [
2+
"lib/common",
3+
"ui/resizable"
4+
], function( common ) {
5+
6+
common.testWidget( "resizable", {
27
defaults: {
38
alsoResize: false,
49
animate: false,
@@ -31,3 +36,5 @@ TestHelpers.commonWidgetTests( "resizable", {
3136
stop: null
3237
}
3338
});
39+
40+
} );

‎tests/unit/resizable/resizable_core.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*
2-
* resizable_core.js
3-
*/
4-
5-
(function($) {
1+
define( [
2+
"jquery",
3+
"./resizable_test_helpers",
4+
"ui/resizable"
5+
], function( $, resizableTestHelpers ) {
66

77
module("resizable: core");
88

@@ -30,10 +30,10 @@ test("n", function() {
3030

3131
var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ handles: "all" });
3232

33-
TestHelpers.resizable.drag(handle, 0, -50);
33+
resizableTestHelpers.drag(handle, 0, -50);
3434
equal( target.height(), 150, "compare height" );
3535

36-
TestHelpers.resizable.drag(handle, 0, 50);
36+
resizableTestHelpers.drag(handle, 0, 50);
3737
equal( target.height(), 100, "compare height" );
3838

3939
equal( target[0].style.left, "", "left should not be modified" );
@@ -45,10 +45,10 @@ test("s", function() {
4545

4646
var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ handles: "all" });
4747

48-
TestHelpers.resizable.drag(handle, 0, 50);
48+
resizableTestHelpers.drag(handle, 0, 50);
4949
equal( target.height(), 150, "compare height" );
5050

51-
TestHelpers.resizable.drag(handle, 0, -50);
51+
resizableTestHelpers.drag(handle, 0, -50);
5252
equal( target.height(), 100, "compare height" );
5353

5454
equal( target[0].style.top, "", "top should not be modified" );
@@ -61,10 +61,10 @@ test("e", function() {
6161

6262
var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ handles: "all" });
6363

64-
TestHelpers.resizable.drag(handle, 50);
64+
resizableTestHelpers.drag(handle, 50);
6565
equal( target.width(), 150, "compare width");
6666

67-
TestHelpers.resizable.drag(handle, -50);
67+
resizableTestHelpers.drag(handle, -50);
6868
equal( target.width(), 100, "compare width" );
6969

7070
equal( target[0].style.height, "", "height should not be modified" );
@@ -77,10 +77,10 @@ test("w", function() {
7777

7878
var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ handles: "all" });
7979

80-
TestHelpers.resizable.drag(handle, -50);
80+
resizableTestHelpers.drag(handle, -50);
8181
equal( target.width(), 150, "compare width" );
8282

83-
TestHelpers.resizable.drag(handle, 50);
83+
resizableTestHelpers.drag(handle, 50);
8484
equal( target.width(), 100, "compare width" );
8585

8686
equal( target[0].style.height, "", "height should not be modified" );
@@ -92,11 +92,11 @@ test("ne", function() {
9292

9393
var handle = ".ui-resizable-ne", target = $("#resizable1").css({ overflow: "hidden" }).resizable({ handles: "all" });
9494

95-
TestHelpers.resizable.drag(handle, -50, -50);
95+
resizableTestHelpers.drag(handle, -50, -50);
9696
equal( target.width(), 50, "compare width" );
9797
equal( target.height(), 150, "compare height" );
9898

99-
TestHelpers.resizable.drag(handle, 50, 50);
99+
resizableTestHelpers.drag(handle, 50, 50);
100100
equal( target.width(), 100, "compare width" );
101101
equal( target.height(), 100, "compare height" );
102102

@@ -108,11 +108,11 @@ test("se", function() {
108108

109109
var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all" });
110110

111-
TestHelpers.resizable.drag(handle, 50, 50);
111+
resizableTestHelpers.drag(handle, 50, 50);
112112
equal( target.width(), 150, "compare width" );
113113
equal( target.height(), 150, "compare height" );
114114

115-
TestHelpers.resizable.drag(handle, -50, -50);
115+
resizableTestHelpers.drag(handle, -50, -50);
116116
equal( target.width(), 100, "compare width" );
117117
equal( target.height(), 100, "compare height" );
118118

@@ -125,11 +125,11 @@ test("sw", function() {
125125

126126
var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all" });
127127

128-
TestHelpers.resizable.drag(handle, -50, -50);
128+
resizableTestHelpers.drag(handle, -50, -50);
129129
equal( target.width(), 150, "compare width" );
130130
equal( target.height(), 50, "compare height" );
131131

132-
TestHelpers.resizable.drag(handle, 50, 50);
132+
resizableTestHelpers.drag(handle, 50, 50);
133133
equal( target.width(), 100, "compare width" );
134134
equal( target.height(), 100, "compare height" );
135135

@@ -141,11 +141,11 @@ test("nw", function() {
141141

142142
var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all" });
143143

144-
TestHelpers.resizable.drag(handle, -50, -50);
144+
resizableTestHelpers.drag(handle, -50, -50);
145145
equal( target.width(), 150, "compare width" );
146146
equal( target.height(), 150, "compare height" );
147147

148-
TestHelpers.resizable.drag(handle, 50, 50);
148+
resizableTestHelpers.drag(handle, 50, 50);
149149
equal( target.width(), 100, "compare width" );
150150
equal( target.height(), 100, "compare height" );
151151
});
@@ -163,10 +163,10 @@ test("handle with complex markup (#8756)", function() {
163163

164164
var handle = ".ui-resizable-w div", target = $("#resizable1").resizable({ handles: "all" });
165165

166-
TestHelpers.resizable.drag(handle, -50);
166+
resizableTestHelpers.drag(handle, -50);
167167
equal( target.width(), 150, "compare width" );
168168

169-
TestHelpers.resizable.drag(handle, 50);
169+
resizableTestHelpers.drag(handle, 50);
170170
equal( target.width(), 100, "compare width" );
171171
});
172172

@@ -186,7 +186,7 @@ test("resizable accounts for scroll position correctly (#3815)", function() {
186186
left = el.css("left");
187187
top = el.css("top");
188188

189-
TestHelpers.resizable.drag(handle, 50, 50);
189+
resizableTestHelpers.drag(handle, 50, 50);
190190
deepEqual( el.position(), position, "position stays the same when resized" );
191191
equal( el.css("left"), left, "css('left') stays the same when resized" );
192192
equal( el.css("top"), top, "css('top') stays the same when resized" );
@@ -203,7 +203,7 @@ test( "resizable stores correct size when using helper and grid (#9547)", functi
203203
grid: [ 10, 10 ]
204204
});
205205

206-
TestHelpers.resizable.drag( handle, 1, 1 );
206+
resizableTestHelpers.drag( handle, 1, 1 );
207207
equal( target.width(), 100, "compare width" );
208208
equal( target.height(), 100, "compare height" );
209209
});
@@ -227,18 +227,18 @@ test( "nested resizable", function() {
227227
innerHandle = $( "#inner > .ui-resizable-e" );
228228
outerHandle = $( "#outer > .ui-resizable-e" );
229229

230-
TestHelpers.resizable.drag( innerHandle, 10 );
230+
resizableTestHelpers.drag( innerHandle, 10 );
231231
equal( inner.width(), 40, "compare width of inner element" );
232-
TestHelpers.resizable.drag( innerHandle, -10 );
232+
resizableTestHelpers.drag( innerHandle, -10 );
233233
equal( inner.width(), 30, "compare width of inner element" );
234234

235-
TestHelpers.resizable.drag( outerHandle, 10 );
235+
resizableTestHelpers.drag( outerHandle, 10 );
236236
equal( outer.width(), 60, "compare width of outer element" );
237-
TestHelpers.resizable.drag( outerHandle, -10 );
237+
resizableTestHelpers.drag( outerHandle, -10 );
238238
equal( outer.width(), 50, "compare width of outer element" );
239239

240240
inner.remove();
241241
outer.remove();
242242
});
243243

244-
})(jQuery);
244+
} );

‎tests/unit/resizable/resizable_events.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
/*
2-
* resizable_events.js
3-
*/
4-
(function($) {
1+
define( [
2+
"jquery",
3+
"./resizable_test_helpers",
4+
"ui/resizable"
5+
], function( $, resizableTestHelpers ) {
56

67
module("resizable: events");
78

@@ -23,7 +24,7 @@ test("start", function() {
2324
}
2425
});
2526

26-
TestHelpers.resizable.drag(handle, 50, 50);
27+
resizableTestHelpers.drag(handle, 50, 50);
2728

2829
equal(count, 1, "start callback should happen exactly once");
2930

@@ -54,7 +55,7 @@ test( "resize", function() {
5455
}
5556
});
5657

57-
TestHelpers.resizable.drag( handle, 50, 50 );
58+
resizableTestHelpers.drag( handle, 50, 50 );
5859

5960
equal( count, 2, "resize callback should happen exactly once per size adjustment" );
6061

@@ -82,7 +83,7 @@ test( "resize (min/max dimensions)", function() {
8283
}
8384
});
8485

85-
TestHelpers.resizable.drag( handle, -200, -200 );
86+
resizableTestHelpers.drag( handle, -200, -200 );
8687

8788
equal( count, 1, "resize callback should happen exactly once per size adjustment" );
8889

@@ -112,10 +113,10 @@ test( "resize (containment)", function() {
112113
});
113114

114115
// Prove you can't resize outside containment by dragging southeast corner southeast
115-
TestHelpers.resizable.drag( handle, 100, 100 );
116+
resizableTestHelpers.drag( handle, 100, 100 );
116117

117118
// Prove you can't resize outside containment by dragging southeast corner northwest
118-
TestHelpers.resizable.drag( handle, -200, -200 );
119+
resizableTestHelpers.drag( handle, -200, -200 );
119120

120121
equal( count, 1, "resize callback should happen exactly once per size adjustment" );
121122

@@ -140,7 +141,7 @@ test("resize (grid)", function() {
140141
}
141142
});
142143

143-
TestHelpers.resizable.drag(handle, 50, 50);
144+
resizableTestHelpers.drag(handle, 50, 50);
144145

145146
equal(count, 1, "resize callback should happen exactly once per grid-unit size adjustment");
146147

@@ -159,7 +160,7 @@ test( "resize, custom adjustment", function() {
159160
}
160161
});
161162

162-
TestHelpers.resizable.drag( handle, 50, 50 );
163+
resizableTestHelpers.drag( handle, 50, 50 );
163164

164165
equal( element.width(), 100, "resize event can control width" );
165166
equal( element.height(), 200, "resize event can control height" );
@@ -185,7 +186,7 @@ test("stop", function() {
185186
}
186187
});
187188

188-
TestHelpers.resizable.drag(handle, 50, 50);
189+
resizableTestHelpers.drag(handle, 50, 50);
189190

190191
equal(count, 1, "stop callback should happen exactly once");
191192

@@ -230,12 +231,12 @@ test( "resize (containment) works with parent with negative offset", function()
230231

231232
widthBefore = target.width();
232233

233-
TestHelpers.resizable.drag( handle, increaseWidthBy, 0 );
234+
resizableTestHelpers.drag( handle, increaseWidthBy, 0 );
234235

235236
widthAfter = target.width();
236237

237238
equal( widthAfter, ( widthBefore + increaseWidthBy ), "resizable width should be increased by the value dragged" );
238239

239240
});
240241

241-
})(jQuery);
242+
} );

‎tests/unit/resizable/resizable_methods.js

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

66
module( "resizable: methods" );
77

@@ -18,4 +18,4 @@ test( "disable", function( assert ) {
1818
equal( chainable, element, "disable is chainable" );
1919
});
2020

21-
})(jQuery);
21+
} );

0 commit comments

Comments
 (0)