Skip to content

Commit d62d9d4

Browse files
scottgonzalezscottgonzalez
committed
Spinner tests: Don't pollute the global namespace with helpers.
1 parent e9d5079 commit d62d9d4

File tree

6 files changed

+65
-55
lines changed

6 files changed

+65
-55
lines changed

‎grunt.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ grunt.initConfig({
383383
shouldnotmove: true,
384384
shouldnotresize: true,
385385
shouldresize: true,
386-
spinner_simulateKeyDownUp: true,
387386
start: true,
388387
strictEqual: true,
389388
stop: true,

‎tests/unit/spinner/spinner_core.js

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
(function( $ ) {
22

3+
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
4+
35
module( "spinner: core" );
46

57
test( "keydown UP on input, increases value not greater than max", function() {
@@ -9,15 +11,15 @@ test( "keydown UP on input, increases value not greater than max", function() {
911
step: 10
1012
});
1113

12-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
14+
simulateKeyDownUp( element, $.ui.keyCode.UP );
1315
equal( element.val(), 80 );
14-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
16+
simulateKeyDownUp( element, $.ui.keyCode.UP );
1517
equal( element.val(), 90 );
16-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
18+
simulateKeyDownUp( element, $.ui.keyCode.UP );
1719
equal( element.val(), 100 );
18-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
20+
simulateKeyDownUp( element, $.ui.keyCode.UP );
1921
equal( element.val(), 100 );
20-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
22+
simulateKeyDownUp( element, $.ui.keyCode.UP );
2123
equal( element.val(), 100 );
2224
});
2325

@@ -28,15 +30,15 @@ test( "keydown DOWN on input, decreases value not less than min", function() {
2830
step: 10
2931
});
3032

31-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
33+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
3234
equal( element.val(), 40 );
33-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
35+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
3436
equal( element.val(), 30 );
35-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
37+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
3638
equal( element.val(), 20 );
37-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
39+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
3840
equal( element.val(), 20 );
39-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
41+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
4042
equal( element.val(), 20 );
4143
});
4244

@@ -47,15 +49,15 @@ test( "keydown PAGE_UP on input, increases value not greater than max", function
4749
page: 10
4850
});
4951

50-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
52+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
5153
equal( element.val(), 80 );
52-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
54+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
5355
equal( element.val(), 90 );
54-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
56+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
5557
equal( element.val(), 100 );
56-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
58+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
5759
equal( element.val(), 100 );
58-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
60+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
5961
equal( element.val(), 100 );
6062
});
6163

@@ -66,15 +68,15 @@ test( "keydown PAGE_DOWN on input, decreases value not less than min", function(
6668
page: 10
6769
});
6870

69-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
71+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
7072
equal( element.val(), 40 );
71-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
73+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
7274
equal( element.val(), 30 );
73-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
75+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
7476
equal( element.val(), 20 );
75-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
77+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
7678
equal( element.val(), 20 );
77-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
79+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
7880
equal( element.val(), 20 );
7981
});
8082

‎tests/unit/spinner/spinner_events.js

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
(function( $ ) {
22

3+
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
4+
35
module( "spinner: events" );
46

57
test( "start", function() {
@@ -13,14 +15,14 @@ test( "start", function() {
1315
}
1416

1517
shouldStart( true, "key UP" );
16-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
18+
simulateKeyDownUp( element, $.ui.keyCode.UP );
1719
shouldStart( true, "key DOWN" );
18-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
20+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
1921

2022
shouldStart( true, "key PAGE_UP" );
21-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
23+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
2224
shouldStart( true, "key PAGE_DOWN" );
23-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
25+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
2426

2527
shouldStart( true, "button up" );
2628
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
@@ -52,14 +54,14 @@ test( "spin", function() {
5254
}
5355

5456
shouldSpin( true, "key UP" );
55-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
57+
simulateKeyDownUp( element, $.ui.keyCode.UP );
5658
shouldSpin( true, "key DOWN" );
57-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
59+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
5860

5961
shouldSpin( true, "key PAGE_UP" );
60-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
62+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
6163
shouldSpin( true, "key PAGE_DOWN" );
62-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
64+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
6365

6466
shouldSpin( true, "button up" );
6567
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
@@ -91,14 +93,14 @@ test( "stop", function() {
9193
}
9294

9395
shouldStop( true, "key UP" );
94-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
96+
simulateKeyDownUp( element, $.ui.keyCode.UP );
9597
shouldStop( true, "key DOWN" );
96-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
98+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
9799

98100
shouldStop( true, "key PAGE_UP" );
99-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
101+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
100102
shouldStop( true, "key PAGE_DOWN" );
101-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
103+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
102104

103105
shouldStop( true, "button up" );
104106
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
@@ -131,42 +133,42 @@ test( "change", function() {
131133

132134
element.focus();
133135
shouldChange( false, "key UP, before blur" );
134-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
136+
simulateKeyDownUp( element, $.ui.keyCode.UP );
135137
shouldChange( true, "blur after key UP" );
136138
element.blur();
137139

138140
element.focus();
139141
shouldChange( false, "key DOWN, before blur" );
140-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
142+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
141143
shouldChange( true, "blur after key DOWN" );
142144
element.blur();
143145

144146
element.focus();
145147
shouldChange( false, "key PAGE_UP, before blur" );
146-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
148+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
147149
shouldChange( true, "blur after key PAGE_UP" );
148150
element.blur();
149151

150152
element.focus();
151153
shouldChange( false, "key PAGE_DOWN, before blur" );
152-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
154+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
153155
shouldChange( true, "blur after key PAGE_DOWN" );
154156
element.blur();
155157

156158
shouldChange( false, "many keys, before blur" );
157-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
158-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
159-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
160-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
161-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
159+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
160+
simulateKeyDownUp( element, $.ui.keyCode.UP );
161+
simulateKeyDownUp( element, $.ui.keyCode.UP );
162+
simulateKeyDownUp( element, $.ui.keyCode.UP );
163+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
162164
shouldChange( true, "blur after many keys" );
163165
element.blur();
164166

165167
shouldChange( false, "many keys, same final value, before blur" );
166-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
167-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
168-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
169-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
168+
simulateKeyDownUp( element, $.ui.keyCode.UP );
169+
simulateKeyDownUp( element, $.ui.keyCode.UP );
170+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
171+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
170172
shouldChange( false, "blur after many keys, same final value" );
171173

172174
shouldChange( false, "button up, before blur" );

‎tests/unit/spinner/spinner_methods.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
(function( $ ) {
22

3+
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
4+
35
module( "spinner: methods" );
46

57
test( "destroy", function() {
@@ -21,16 +23,16 @@ test( "disable", function() {
2123
ok( wrapper.hasClass( "ui-spinner-disabled" ), "after: wrapper has ui-spinner-disabled class" );
2224
ok( element.is( ":disabled"), "after: input has disabled attribute" );
2325

24-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
26+
simulateKeyDownUp( element, $.ui.keyCode.UP );
2527
equal( 2, element.val(), "keyboard - value does not change on key UP" );
2628

27-
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
29+
simulateKeyDownUp( element, $.ui.keyCode.DOWN );
2830
equal( 2, element.val(), "keyboard - value does not change on key DOWN" );
2931

30-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
32+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
3133
equal( 2, element.val(), "keyboard - value does not change on key PGUP" );
3234

33-
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
35+
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
3436
equal( 2, element.val(), "keyboard - value does not change on key PGDN" );
3537

3638
wrapper.find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
@@ -65,7 +67,7 @@ test( "enable", function() {
6567
ok( !wrapper.hasClass( ".ui-spinner-disabled" ), "after: wrapper does not have ui-spinner-disabled class" );
6668
ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
6769

68-
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
70+
simulateKeyDownUp( element, $.ui.keyCode.UP );
6971
equal( 2, element.val(), "keyboard - value changes on key UP" );
7072
});
7173

‎tests/unit/spinner/spinner_options.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
(function( $ ) {
22

3+
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
4+
35
module( "spinner: options" );
46

57
// culture is tested after numberFormat, since it depends on numberFormat

‎tests/unit/spinner/spinner_test_helpers.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
var spinner_simulateKeyDownUp = function( element, keyCode, shift ) {
2-
element
3-
.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
4-
.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
1+
TestHelpers.spinner = {
2+
simulateKeyDownUp: function( element, keyCode, shift ) {
3+
element
4+
.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
5+
.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
6+
}
57
};
8+

0 commit comments

Comments
 (0)