Skip to content

Commit 380c2e6

Browse files
scottgonzalezscottgonzalez
committed
Spinner tests: Cleanup.
1 parent e9cdd57 commit 380c2e6

File tree

3 files changed

+204
-247
lines changed

3 files changed

+204
-247
lines changed

‎tests/unit/spinner/spinner_events.js

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,50 @@
1-
/*
2-
* spinner_events.js
3-
*/
4-
(function($) {
1+
(function( $ ) {
52

6-
module("spinner: events");
3+
module( "spinner: events" );
74

8-
test("start", function() {
9-
var start = 0;
10-
11-
var el = $("#spin").spinner({
12-
start: function(){
13-
start++;
5+
test( "start", function() {
6+
expect( 1 );
7+
var element = $( "#spin" ).spinner({
8+
start: function() {
9+
ok( true, "start" );
1410
}
1511
});
1612

17-
spinner_simulateKeyDownUp(el, $.ui.keyCode.UP);
18-
19-
equals(start, 1, "Start triggered");
13+
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
2014
});
2115

22-
test("spin", function() {
23-
var spin = 0;
24-
25-
var el = $("#spin").spinner({
16+
test( "spin", function() {
17+
expect( 1 );
18+
var element = $( "#spin" ).spinner({
2619
spin: function(){
27-
spin++;
20+
ok( true, "spin" );
2821
}
2922
});
3023

31-
spinner_simulateKeyDownUp(el, $.ui.keyCode.UP);
32-
33-
equals(spin, 1, "Spin triggered");
24+
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
3425
});
3526

36-
test("stop", function() {
37-
var stop = 0;
38-
39-
var el = $("#spin").spinner({
27+
test( "stop", function() {
28+
expect( 1 );
29+
var element = $( "#spin" ).spinner({
4030
stop: function(){
41-
stop++;
31+
ok( true, "stop" );
4232
}
4333
});
4434

45-
spinner_simulateKeyDownUp(el, $.ui.keyCode.DOWN);
46-
47-
equals(stop, 1, "Stop triggered");
35+
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
4836
});
4937

50-
test("change", function() {
51-
var change = 0;
52-
53-
var el = $("#spin").spinner({
38+
test( "change", function() {
39+
expect( 1 );
40+
var element = $( "#spin" ).spinner({
5441
change: function(){
55-
change++;
42+
ok( true, "change" );
5643
}
5744
});
5845

59-
spinner_simulateKeyDownUp(el, $.ui.keyCode.UP);
60-
el.blur();
61-
62-
equals(change, 1, "Change triggered");
46+
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
47+
element.blur();
6348
});
6449

65-
})(jQuery);
50+
})( jQuery );

‎tests/unit/spinner/spinner_methods.js

Lines changed: 128 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,159 @@
1-
/*
2-
* spinner_methods.js
3-
*/
4-
(function($) {
5-
6-
module("spinner: methods");
7-
8-
test("disable", function() {
9-
var el = $("#spin").spinner({ disabled: false }),
10-
val = el.val(),
11-
wrapper = $("#spin").spinner("widget");
12-
13-
ok(!wrapper.hasClass("ui-spinner-disabled"), "before: wrapper does not have ui-spinner-disabled class");
14-
ok(!el.is(':disabled'), "before: input does not have disabled attribute");
15-
16-
el.spinner("disable");
17-
ok(wrapper.hasClass("ui-spinner-disabled"), "after: wrapper has ui-spinner-disabled class");
18-
ok(el.is(':disabled'), "after: input has disabled attribute");
19-
20-
spinner_simulateKeyDownUp(el, $.ui.keyCode.UP);
21-
equals(val, el.val(), "keyboard - value does not change on key UP");
22-
23-
spinner_simulateKeyDownUp(el, $.ui.keyCode.DOWN);
24-
equals(val, el.val(), "keyboard - value does not change on key DOWN");
25-
26-
spinner_simulateKeyDownUp(el, $.ui.keyCode.PAGE_UP);
27-
equals(val, el.val(), "keyboard - value does not change on key PGUP");
28-
29-
spinner_simulateKeyDownUp(el, $.ui.keyCode.PAGE_DOWN);
30-
equals(val, el.val(), "keyboard - value does not change on key PGDN");
31-
32-
wrapper.find(":ui-button").first().trigger('mousedown').trigger('mouseup');
33-
equals(val, el.val(), "mouse - value does not change on clicking up button");
34-
35-
wrapper.find(":ui-button").last().trigger('mousedown').trigger('mouseup');
36-
equals(val, el.val(), "mouse - value does not change on clicking down button");
37-
38-
el.spinner('stepUp', 6);
39-
equals(6, el.val(), "script - stepUp 6 steps changes value");
40-
41-
el.spinner('stepDown');
42-
equals(5, el.val(), "script - stepDown 1 step changes value");
43-
44-
el.spinner('pageUp');
45-
equals(15, el.val(), "script - pageUp 1 page changes value");
46-
47-
el.spinner('pageDown');
48-
equals(5, el.val(), "script - pageDown 1 page changes value");
1+
(function( $ ) {
492

3+
module( "spinner: methods" );
4+
5+
test( "disable", function() {
6+
expect( 14 );
7+
var element = $( "#spin" ).spinner({ value: 2 }),
8+
wrapper = $( "#spin" ).spinner( "widget" );
9+
10+
ok( !wrapper.hasClass( "ui-spinner-disabled" ), "before: wrapper does not have ui-spinner-disabled class" );
11+
ok( !element.is( ":disabled" ), "before: input does not have disabled attribute" );
12+
13+
element.spinner( "disable" );
14+
ok( wrapper.hasClass( "ui-spinner-disabled" ), "after: wrapper has ui-spinner-disabled class" );
15+
ok( element.is( ":disabled"), "after: input has disabled attribute" );
16+
17+
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
18+
equals( 2, element.val(), "keyboard - value does not change on key UP" );
19+
20+
spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
21+
equals( 2, element.val(), "keyboard - value does not change on key DOWN" );
22+
23+
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
24+
equals( 2, element.val(), "keyboard - value does not change on key PGUP" );
25+
26+
spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
27+
equals( 2, element.val(), "keyboard - value does not change on key PGDN" );
28+
29+
wrapper.find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
30+
equals( 2, element.val(), "mouse - value does not change on clicking up button" );
31+
32+
wrapper.find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
33+
equals( 2, element.val(), "mouse - value does not change on clicking down button" );
34+
35+
element.spinner( "stepUp", 6 );
36+
equals( 8, element.val(), "script - stepUp 6 steps changes value");
37+
38+
element.spinner( "stepDown" );
39+
equals( 7, element.val(), "script - stepDown 1 step changes value" );
40+
41+
element.spinner( "pageUp" );
42+
equals( 17, element.val(), "script - pageUp 1 page changes value" );
43+
44+
element.spinner( "pageDown" );
45+
equals( 7, element.val(), "script - pageDown 1 page changes value" );
5046
});
5147

52-
test("enable", function() {
53-
var el = $("#spin").spinner({ disabled: true })
54-
val = el.val(),
55-
wrapper = el.spinner("widget");
56-
57-
ok(wrapper.hasClass("ui-spinner-disabled"), "before: wrapper has ui-spinner-disabled class");
58-
ok(el.is(':disabled'), "before: input has disabled attribute");
59-
60-
el.spinner("enable");
61-
62-
ok(!wrapper.hasClass(".ui-spinner-disabled"), "after: wrapper does not have ui-spinner-disabled class");
63-
ok(!el.is(':disabled'), "after: input does not have disabled attribute");
48+
test( "enable", function() {
49+
expect( 5 );
50+
var element = $( "#spin" ).spinner({ disabled: true })
51+
wrapper = element.spinner( "widget" );
52+
53+
ok( wrapper.hasClass( "ui-spinner-disabled" ), "before: wrapper has ui-spinner-disabled class" );
54+
ok( element.is( ":disabled" ), "before: input has disabled attribute" );
55+
56+
element.spinner( "enable" );
57+
58+
ok( !wrapper.hasClass( ".ui-spinner-disabled" ), "after: wrapper does not have ui-spinner-disabled class" );
59+
ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
60+
61+
spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
62+
equals( 1, element.val(), "keyboard - value does not change on key UP" );
6463
});
6564

66-
test("pageDown", function() {
67-
var el = $('#spin').spinner({
68-
step: 2,
69-
value: 0,
65+
test( "pageDown", function() {
66+
expect( 4 );
67+
var element = $( "#spin" ).spinner({
68+
page: 20,
69+
value: -12,
7070
min: -100
7171
});
7272

73-
el.spinner('pageDown');
74-
equals(el.val(), -20, "pageDown 1 page");
75-
76-
el.spinner('pageDown', 3);
77-
equals(el.val(), -80, "pageDown 3 pages");
78-
79-
el.val(-91).spinner('pageDown');
80-
equals(el.val(), -100, "value close to min and pageDown 1 page");
81-
82-
el.spinner('pageDown', 10);
83-
equals(el.val(), -100, "value at min and pageDown 10 pages");
73+
element.spinner( "pageDown" );
74+
equals( element.val(), -32, "pageDown 1 page" );
75+
76+
element.spinner( "pageDown", 3 );
77+
equals( element.val(), -92, "pageDown 3 pages" );
78+
79+
element.spinner( "pageDown" );
80+
equals( element.val(), -100, "value close to min and pageDown 1 page" );
81+
82+
element.spinner( "pageDown", 10 );
83+
equals( element.val(), -100, "value at min and pageDown 10 pages" );
8484
});
8585

86-
test("pageUp", function() {
87-
var el = $('#spin').spinner({
88-
step: 2,
89-
value: 0,
86+
test( "pageUp", function() {
87+
expect( 4 );
88+
var element = $( "#spin" ).spinner({
89+
page: 20,
90+
value: 12,
9091
max: 100
9192
});
9293

93-
el.spinner('pageUp');
94-
equals(el.val(), 20, "pageUp 1 page");
94+
element.spinner( "pageUp" );
95+
equals( element.val(), 32, "pageUp 1 page" );
9596

96-
el.spinner('pageUp', 3);
97-
equals(el.val(), 80, "pageUp 3 pages");
97+
element.spinner( "pageUp", 3 );
98+
equals( element.val(), 92, "pageUp 3 pages" );
9899

99-
el.val(91).spinner('pageUp');
100-
equals(el.val(), 100, "value close to max and pageUp 1 page");
101-
102-
el.spinner('pageUp', 10);
103-
equals(el.val(), 100, "value at max and pageUp 10 pages");
104-
100+
element.spinner( "pageUp" );
101+
equals( element.val(), 100, "value close to max and pageUp 1 page" );
102+
103+
element.spinner( "pageUp", 10 );
104+
equals( element.val(), 100, "value at max and pageUp 10 pages" );
105105
});
106106

107-
test("stepDown", function() {
108-
expect(4);
107+
test( "stepDown", function() {
108+
expect( 4 );
109+
var element = $( "#spin" ).spinner({
110+
step: 2,
111+
value: 0,
112+
min: -15
113+
});
109114

110-
el = $('#spin').spinner({ step: 2, page: 5, value: 0, min: -15 });
115+
element.spinner( "stepDown" );
116+
equals( element.val(), -2, "stepDown 1 step" );
111117

112-
el.spinner('stepDown')
113-
equals(el.val(), -2, "stepDown 1 step");
118+
element.spinner( "stepDown", 5 );
119+
equals( element.val(), -12, "stepDown 5 steps" );
114120

115-
el.spinner('stepDown', 5)
116-
equals(el.val(), -12, "stepDown 5 steps");
117-
118-
el.spinner('stepDown', 3);
119-
equals(el.val(), -15, "close to min and stepDown 3 steps");
121+
element.spinner( "stepDown", 4 );
122+
equals( element.val(), -15, "close to min and stepDown 4 steps" );
120123

121-
el.spinner('stepDown');
122-
equals(el.val(), -15, "at min and stepDown 1 step");
124+
element.spinner( "stepDown" );
125+
equals( element.val(), -15, "at min and stepDown 1 step" );
123126
});
124127

125-
test("stepUp", function() {
126-
expect(4);
127-
128-
el = $('#spin').spinner({ step: 2, page: 5, value: 0, max: 15 });
128+
test( "stepUp", function() {
129+
expect( 4 );
130+
var element = $( "#spin" ).spinner({
131+
step: 2,
132+
value: 0,
133+
max: 15
134+
});
129135

130-
el.spinner('stepUp')
131-
equals(el.val(), 2, "stepUp 1 steps");
136+
element.spinner( "stepUp" );
137+
equals( element.val(), 2, "stepUp 1 step" );
132138

133-
el.spinner('stepUp', 5)
134-
equals(el.val(), 12, "stepUp 5 steps");
135-
136-
el.spinner('stepUp', 3);
137-
equals(el.val(), 15, "close to min and stepUp 3 steps");
139+
element.spinner( "stepUp", 5 );
140+
equals( element.val(), 12, "stepUp 5 steps" );
138141

139-
el.spinner('stepUp');
140-
equals(el.val(), 15, "at min and stepUp 1 step");
142+
element.spinner( "stepUp", 4 );
143+
equals( element.val(), 15, "close to min and stepUp 4 steps" );
141144

145+
element.spinner( "stepUp" );
146+
equals( element.val(), 15, "at max and stepUp 1 step" );
142147
});
143148

144-
test("value", function() {
145-
expect(2);
146-
147-
el = $('#spin').spinner({ value: 0 });
148-
149-
el.spinner('value', 10);
150-
equals(el.val(), 10, "change value via value method");
151-
152-
equals(10, el.spinner('value'), "get value via value method");
149+
test( "value", function() {
150+
expect( 2 );
151+
var element = $( "#spin" ).spinner({ value: 0 });
152+
153+
element.spinner( "value", 10 );
154+
equals( element.val(), 10, "change value via value method" );
155+
156+
equals( element.spinner( "value" ), 10, "get value via value method" );
153157
});
154158

155-
})(jQuery);
159+
})( jQuery );

0 commit comments

Comments
 (0)