Skip to content

Commit 38d4737

Browse files
committed
Slider: Shift to use no globals
1 parent d00c564 commit 38d4737

File tree

4 files changed

+217
-213
lines changed

4 files changed

+217
-213
lines changed

tests/unit/slider/core.js

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

67
var element, options;
78

@@ -10,10 +11,10 @@ function handle() {
1011
}
1112

1213
// Slider Tests
13-
module( "slider: core" );
14+
QUnit.module( "slider: core" );
1415

15-
test( "markup structure", function( assert ) {
16-
expect( 4 );
16+
QUnit.test( "markup structure", function( assert ) {
17+
assert.expect( 4 );
1718
var element = $( "<div>" ).slider( { range: true } ),
1819
handle = element.find( "span" ),
1920
range = element.find( "div" );
@@ -24,8 +25,8 @@ test( "markup structure", function( assert ) {
2425
assert.hasClasses( handle[ 1 ], "ui-slider-handle" );
2526
} );
2627

27-
test( "keydown HOME on handle sets value to min", function() {
28-
expect( 2 );
28+
QUnit.test( "keydown HOME on handle sets value to min", function( assert ) {
29+
assert.expect( 2 );
2930
element = $( "<div></div>" );
3031
options = {
3132
max: 5,
@@ -38,7 +39,7 @@ test( "keydown HOME on handle sets value to min", function() {
3839
element.slider( "value", 0 );
3940

4041
handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
41-
equal( element.slider( "value" ), options.min );
42+
assert.equal( element.slider( "value" ), options.min );
4243

4344
element.slider( "destroy" );
4445

@@ -54,13 +55,13 @@ test( "keydown HOME on handle sets value to min", function() {
5455
element.slider( "value", 0 );
5556

5657
handle().simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
57-
equal( element.slider( "value" ), options.min ) ;
58+
assert.equal( element.slider( "value" ), options.min ) ;
5859

5960
element.slider( "destroy" );
6061
} );
6162

62-
test( "keydown END on handle sets value to max", function() {
63-
expect( 2 );
63+
QUnit.test( "keydown END on handle sets value to max", function( assert ) {
64+
assert.expect( 2 );
6465
element = $( "<div></div>" );
6566
options = {
6667
max: 5,
@@ -73,7 +74,7 @@ test( "keydown END on handle sets value to max", function() {
7374
element.slider( "value", 0 );
7475

7576
handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
76-
equal( element.slider( "value" ), options.max ) ;
77+
assert.equal( element.slider( "value" ), options.max ) ;
7778

7879
element.slider( "destroy" );
7980

@@ -89,13 +90,13 @@ test( "keydown END on handle sets value to max", function() {
8990
element.slider( "value", 0 );
9091

9192
handle().simulate( "keydown", { keyCode: $.ui.keyCode.END } );
92-
equal( element.slider( "value" ), options.max );
93+
assert.equal( element.slider( "value" ), options.max );
9394

9495
element.slider( "destroy" );
9596
} );
9697

97-
test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than max", function() {
98-
expect( 4 );
98+
QUnit.test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than max", function( assert ) {
99+
assert.expect( 4 );
99100
$.each( [ "horizontal", "vertical" ], function( i, orientation ) {
100101
element = $( "<div></div>" );
101102
options = {
@@ -109,17 +110,17 @@ test( "keydown PAGE_UP on handle increases value by 1/5 range, not greater than
109110
element.slider( "value", 70 );
110111

111112
handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
112-
equal( element.slider( "value" ), 90 );
113+
assert.equal( element.slider( "value" ), 90 );
113114

114115
handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
115-
equal( element.slider( "value" ), 100 );
116+
assert.equal( element.slider( "value" ), 100 );
116117

117118
element.slider( "destroy" );
118119
} );
119120
} );
120121

121-
test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than min", function() {
122-
expect( 4 );
122+
QUnit.test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than min", function( assert ) {
123+
assert.expect( 4 );
123124
$.each( [ "horizontal", "vertical" ], function( i, orientation ) {
124125
element = $( "<div></div>" );
125126
options = {
@@ -133,17 +134,17 @@ test( "keydown PAGE_DOWN on handle decreases value by 1/5 range, not less than m
133134
element.slider( "value", 30 );
134135

135136
handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
136-
equal( element.slider( "value" ), 10 );
137+
assert.equal( element.slider( "value" ), 10 );
137138

138139
handle().simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
139-
equal( element.slider( "value" ), 0 );
140+
assert.equal( element.slider( "value" ), 0 );
140141

141142
element.slider( "destroy" );
142143
} );
143144
} );
144145

145-
test( "keydown UP on handle increases value by step, not greater than max", function() {
146-
expect( 4 );
146+
QUnit.test( "keydown UP on handle increases value by step, not greater than max", function( assert ) {
147+
assert.expect( 4 );
147148
element = $( "<div></div>" );
148149
options = {
149150
max: 5,
@@ -156,10 +157,10 @@ test( "keydown UP on handle increases value by step, not greater than max", func
156157
element.slider( "value", options.max - options.step );
157158

158159
handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
159-
equal( element.slider( "value" ), options.max );
160+
assert.equal( element.slider( "value" ), options.max );
160161

161162
handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
162-
equal( element.slider( "value" ), options.max );
163+
assert.equal( element.slider( "value" ), options.max );
163164

164165
element.slider( "destroy" );
165166

@@ -175,16 +176,16 @@ test( "keydown UP on handle increases value by step, not greater than max", func
175176
element.slider( "value", options.max - options.step );
176177

177178
handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
178-
equal( element.slider( "value" ), options.max );
179+
assert.equal( element.slider( "value" ), options.max );
179180

180181
handle().simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
181-
equal( element.slider( "value" ), options.max );
182+
assert.equal( element.slider( "value" ), options.max );
182183

183184
element.slider( "destroy" );
184185
} );
185186

186-
test( "keydown RIGHT on handle increases value by step, not greater than max", function() {
187-
expect( 4 );
187+
QUnit.test( "keydown RIGHT on handle increases value by step, not greater than max", function( assert ) {
188+
assert.expect( 4 );
188189
element = $( "<div></div>" );
189190
options = {
190191
max: 5,
@@ -197,10 +198,10 @@ test( "keydown RIGHT on handle increases value by step, not greater than max", f
197198
element.slider( "value", options.max - options.step );
198199

199200
handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
200-
equal( element.slider( "value" ), options.max );
201+
assert.equal( element.slider( "value" ), options.max );
201202

202203
handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
203-
equal( element.slider( "value" ), options.max );
204+
assert.equal( element.slider( "value" ), options.max );
204205

205206
element.slider( "destroy" );
206207

@@ -216,16 +217,16 @@ test( "keydown RIGHT on handle increases value by step, not greater than max", f
216217
element.slider( "value", options.max - options.step );
217218

218219
handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
219-
equal( element.slider( "value" ), options.max );
220+
assert.equal( element.slider( "value" ), options.max );
220221

221222
handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
222-
equal( element.slider( "value" ), options.max );
223+
assert.equal( element.slider( "value" ), options.max );
223224

224225
element.slider( "destroy" );
225226
} );
226227

227-
test( "keydown DOWN on handle decreases value by step, not less than min", function() {
228-
expect( 4 );
228+
QUnit.test( "keydown DOWN on handle decreases value by step, not less than min", function( assert ) {
229+
assert.expect( 4 );
229230
element = $( "<div></div>" );
230231
options = {
231232
max: 5,
@@ -238,10 +239,10 @@ test( "keydown DOWN on handle decreases value by step, not less than min", funct
238239
element.slider( "value", options.min + options.step );
239240

240241
handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
241-
equal( element.slider( "value" ), options.min );
242+
assert.equal( element.slider( "value" ), options.min );
242243

243244
handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
244-
equal( element.slider( "value" ), options.min );
245+
assert.equal( element.slider( "value" ), options.min );
245246

246247
element.slider( "destroy" );
247248

@@ -257,16 +258,16 @@ test( "keydown DOWN on handle decreases value by step, not less than min", funct
257258
element.slider( "value", options.min + options.step );
258259

259260
handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
260-
equal( element.slider( "value" ), options.min );
261+
assert.equal( element.slider( "value" ), options.min );
261262

262263
handle().simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
263-
equal( element.slider( "value" ), options.min );
264+
assert.equal( element.slider( "value" ), options.min );
264265

265266
element.slider( "destroy" );
266267
} );
267268

268-
test( "keydown LEFT on handle decreases value by step, not less than min", function() {
269-
expect( 4 );
269+
QUnit.test( "keydown LEFT on handle decreases value by step, not less than min", function( assert ) {
270+
assert.expect( 4 );
270271
element = $( "<div></div>" );
271272
options = {
272273
max: 5,
@@ -279,10 +280,10 @@ test( "keydown LEFT on handle decreases value by step, not less than min", funct
279280
element.slider( "value", options.min + options.step );
280281

281282
handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
282-
equal( element.slider( "value" ), options.min );
283+
assert.equal( element.slider( "value" ), options.min );
283284

284285
handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
285-
equal( element.slider( "value" ), options.min );
286+
assert.equal( element.slider( "value" ), options.min );
286287

287288
element.slider( "destroy" );
288289

@@ -298,10 +299,10 @@ test( "keydown LEFT on handle decreases value by step, not less than min", funct
298299
element.slider( "value", options.min + options.step );
299300

300301
handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
301-
equal( element.slider( "value" ), options.min );
302+
assert.equal( element.slider( "value" ), options.min );
302303

303304
handle().simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
304-
equal( element.slider( "value" ), options.min );
305+
assert.equal( element.slider( "value" ), options.min );
305306

306307
element.slider( "destroy" );
307308
} );

0 commit comments

Comments
 (0)