Skip to content

Commit 4207999

Browse files
apsdehalapsdehal
committed
Widget: Shift tests to use no globals
1 parent 9f490f4 commit 4207999

File tree

4 files changed

+431
-427
lines changed

4 files changed

+431
-427
lines changed

‎tests/unit/widget/animation.js

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
define( [
2+
"qunit",
23
"jquery",
34
"ui/widget"
4-
], function( $ ) {
5+
], function( QUnit, $ ) {
56

6-
module( "widget animation", (function() {
7+
QUnit.module( "widget animation", (function() {
78
var show = $.fn.show,
89
fadeIn = $.fn.fadeIn,
910
slideDown = $.fn.slideDown;
@@ -29,43 +30,43 @@ module( "widget animation", (function() {
2930
};
3031
}()));
3132

32-
asyncTest( "show: null", function() {
33-
expect( 4 );
33+
QUnit.asyncTest( "show: null", function( assert ) {
34+
assert.expect( 4 );
3435

3536
var element = $( "#widget" ).testWidget(),
3637
hasRun = false;
3738
$.fn.show = function() {
38-
ok( true, "show called" );
39-
equal( arguments.length, 0, "no args passed to show" );
39+
assert.ok( true, "show called" );
40+
assert.equal( arguments.length, 0, "no args passed to show" );
4041
};
4142

4243
element
4344
.delay( 50 )
4445
.queue(function( next ) {
45-
ok( !hasRun, "queue before show" );
46+
assert.ok( !hasRun, "queue before show" );
4647
next();
4748
})
4849
.testWidget( "show", function() {
4950
hasRun = true;
5051
})
5152
.queue(function( next ) {
52-
ok( hasRun, "queue after show" );
53-
start();
53+
assert.ok( hasRun, "queue after show" );
54+
QUnit.start();
5455
next();
5556
});
5657
});
5758

58-
asyncTest( "show: true", function() {
59-
expect( 4 );
59+
QUnit.asyncTest( "show: true", function( assert ) {
60+
assert.expect( 4 );
6061

6162
var element = $( "#widget" ).testWidget({
6263
show: true
6364
}),
6465
hasRun = false;
6566
$.fn.fadeIn = function( duration, easing, complete ) {
6667
return this.queue(function( next ) {
67-
strictEqual( duration, undefined, "duration" );
68-
strictEqual( easing, undefined, "easing" );
68+
assert.strictEqual( duration, undefined, "duration" );
69+
assert.strictEqual( easing, undefined, "easing" );
6970
complete();
7071
next();
7172
});
@@ -74,30 +75,30 @@ asyncTest( "show: true", function() {
7475
element
7576
.delay( 50 )
7677
.queue(function( next ) {
77-
ok( !hasRun, "queue before show" );
78+
assert.ok( !hasRun, "queue before show" );
7879
next();
7980
})
8081
.testWidget( "show", function() {
8182
hasRun = true;
8283
})
8384
.queue(function( next ) {
84-
ok( hasRun, "queue after show" );
85-
start();
85+
assert.ok( hasRun, "queue after show" );
86+
QUnit.start();
8687
next();
8788
});
8889
});
8990

90-
asyncTest( "show: number", function() {
91-
expect( 4 );
91+
QUnit.asyncTest( "show: number", function( assert ) {
92+
assert.expect( 4 );
9293

9394
var element = $( "#widget" ).testWidget({
9495
show: 123
9596
}),
9697
hasRun = false;
9798
$.fn.fadeIn = function( duration, easing, complete ) {
9899
return this.queue(function( next ) {
99-
strictEqual( duration, 123, "duration" );
100-
strictEqual( easing, undefined, "easing" );
100+
assert.strictEqual( duration, 123, "duration" );
101+
assert.strictEqual( easing, undefined, "easing" );
101102
complete();
102103
next();
103104
});
@@ -106,30 +107,30 @@ asyncTest( "show: number", function() {
106107
element
107108
.delay( 50 )
108109
.queue(function( next ) {
109-
ok( !hasRun, "queue before show" );
110+
assert.ok( !hasRun, "queue before show" );
110111
next();
111112
})
112113
.testWidget( "show", function() {
113114
hasRun = true;
114115
})
115116
.queue(function( next ) {
116-
ok( hasRun, "queue after show" );
117-
start();
117+
assert.ok( hasRun, "queue after show" );
118+
QUnit.start();
118119
next();
119120
});
120121
});
121122

122-
asyncTest( "show: core animation", function() {
123-
expect( 4 );
123+
QUnit.asyncTest( "show: core animation", function( assert ) {
124+
assert.expect( 4 );
124125

125126
var element = $( "#widget" ).testWidget({
126127
show: "slideDown"
127128
}),
128129
hasRun = false;
129130
$.fn.slideDown = function( duration, easing, complete ) {
130131
return this.queue(function( next ) {
131-
strictEqual( duration, undefined, "duration" );
132-
strictEqual( easing, undefined, "easing" );
132+
assert.strictEqual( duration, undefined, "duration" );
133+
assert.strictEqual( easing, undefined, "easing" );
133134
complete();
134135
next();
135136
});
@@ -138,31 +139,31 @@ asyncTest( "show: core animation", function() {
138139
element
139140
.delay( 50 )
140141
.queue(function( next ) {
141-
ok( !hasRun, "queue before show" );
142+
assert.ok( !hasRun, "queue before show" );
142143
next();
143144
})
144145
.testWidget( "show", function() {
145146
hasRun = true;
146147
})
147148
.queue(function( next ) {
148-
ok( hasRun, "queue after show" );
149-
start();
149+
assert.ok( hasRun, "queue after show" );
150+
QUnit.start();
150151
next();
151152
});
152153
});
153154

154-
asyncTest( "show: effect", function() {
155-
expect( 5 );
155+
QUnit.asyncTest( "show: effect", function( assert ) {
156+
assert.expect( 5 );
156157

157158
var element = $( "#widget" ).testWidget({
158159
show: "testEffect"
159160
}),
160161
hasRun = false;
161162
$.fn.show = function( options ) {
162163
return this.queue(function( next ) {
163-
equal( options.effect, "testEffect", "effect" );
164-
ok( !("duration" in options), "duration" );
165-
ok( !("easing" in options), "easing" );
164+
assert.equal( options.effect, "testEffect", "effect" );
165+
assert.ok( !("duration" in options), "duration" );
166+
assert.ok( !("easing" in options), "easing" );
166167
options.complete();
167168
next();
168169
});
@@ -171,21 +172,21 @@ asyncTest( "show: effect", function() {
171172
element
172173
.delay( 50 )
173174
.queue(function( next ) {
174-
ok( !hasRun, "queue before show" );
175+
assert.ok( !hasRun, "queue before show" );
175176
next();
176177
})
177178
.testWidget( "show", function() {
178179
hasRun = true;
179180
})
180181
.queue(function( next ) {
181-
ok( hasRun, "queue after show" );
182-
start();
182+
assert.ok( hasRun, "queue after show" );
183+
QUnit.start();
183184
next();
184185
});
185186
});
186187

187-
asyncTest( "show: object(core animation)", function() {
188-
expect( 4 );
188+
QUnit.asyncTest( "show: object(core animation)", function( assert ) {
189+
assert.expect( 4 );
189190

190191
var element = $( "#widget" ).testWidget({
191192
show: {
@@ -197,8 +198,8 @@ asyncTest( "show: object(core animation)", function() {
197198
hasRun = false;
198199
$.fn.slideDown = function( duration, easing, complete ) {
199200
return this.queue(function( next ) {
200-
equal( duration, 123, "duration" );
201-
equal( easing, "testEasing", "easing" );
201+
assert.equal( duration, 123, "duration" );
202+
assert.equal( easing, "testEasing", "easing" );
202203
complete();
203204
next();
204205
});
@@ -207,21 +208,21 @@ asyncTest( "show: object(core animation)", function() {
207208
element
208209
.delay( 50 )
209210
.queue(function( next ) {
210-
ok( !hasRun, "queue before show" );
211+
assert.ok( !hasRun, "queue before show" );
211212
next();
212213
})
213214
.testWidget( "show", function() {
214215
hasRun = true;
215216
})
216217
.queue(function( next ) {
217-
ok( hasRun, "queue after show" );
218-
start();
218+
assert.ok( hasRun, "queue after show" );
219+
QUnit.start();
219220
next();
220221
});
221222
});
222223

223-
asyncTest( "show: object(effect)", function() {
224-
expect( 3 );
224+
QUnit.asyncTest( "show: object(effect)", function( assert ) {
225+
assert.expect( 3 );
225226

226227
var element = $( "#widget" ).testWidget({
227228
show: {
@@ -233,7 +234,7 @@ asyncTest( "show: object(effect)", function() {
233234
hasRun = false;
234235
$.fn.show = function( options ) {
235236
return this.queue(function( next ) {
236-
deepEqual( options, {
237+
assert.deepEqual( options, {
237238
effect: "testEffect",
238239
duration: 123,
239240
easing: "testEasing",
@@ -247,15 +248,15 @@ asyncTest( "show: object(effect)", function() {
247248
element
248249
.delay( 50 )
249250
.queue(function( next ) {
250-
ok( !hasRun, "queue before show" );
251+
assert.ok( !hasRun, "queue before show" );
251252
next();
252253
})
253254
.testWidget( "show", function() {
254255
hasRun = true;
255256
})
256257
.queue(function( next ) {
257-
ok( hasRun, "queue after show" );
258-
start();
258+
assert.ok( hasRun, "queue after show" );
259+
QUnit.start();
259260
next();
260261
});
261262
});

‎tests/unit/widget/classes.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
define( [
2+
"qunit",
23
"jquery",
34
"ui/widget"
4-
], function( $ ) {
5+
], function( QUnit, $ ) {
56

6-
module( "widget factory classes", {
7+
QUnit.module( "widget factory classes", {
78
setup: function() {
89
$.widget( "ui.classesWidget", {
910
options: {
@@ -89,8 +90,8 @@ function elementLacksClasses( widget, method, assert ) {
8990
"_" + method + "Class works with ( element, keys, null" + toggle + " )" );
9091
}
9192

92-
test( ".option() - classes setter", function( assert ) {
93-
expect( 11 );
93+
QUnit.test( ".option() - classes setter", function( assert ) {
94+
assert.expect( 11 );
9495

9596
var testWidget = $.ui.classesWidget();
9697

@@ -118,16 +119,16 @@ test( ".option() - classes setter", function( assert ) {
118119
"Appending a class to the current value works as expected" );
119120
});
120121

121-
test( ".destroy() - class removal", function( assert ) {
122-
expect( 1 );
122+
QUnit.test( ".destroy() - class removal", function( assert ) {
123+
assert.expect( 1 );
123124

124125
assert.domEqual( "#widget", function() {
125126
$( "#widget" ).classesWidget().classesWidget( "destroy" );
126127
});
127128
});
128129

129-
test( "._add/_remove/_toggleClass()", function( assert ) {
130-
expect( 24 );
130+
QUnit.test( "._add/_remove/_toggleClass()", function( assert ) {
131+
assert.expect( 24 );
131132

132133
var widget = $( "#widget" ).classesWidget();
133134

0 commit comments

Comments
 (0)