Skip to content

Commit a738d73

Browse files
scottgonzalezscottgonzalez
committed
Progressbar tests: Cleanup.
1 parent e986f36 commit a738d73

File tree

4 files changed

+75
-112
lines changed

4 files changed

+75
-112
lines changed

‎tests/unit/progressbar/progressbar_core.js

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
1-
/*
2-
* progressbar_core.js
3-
*/
1+
module( "progressbar: core" );
42

5-
var el;
3+
test( "accessibility", function() {
4+
expect( 7 );
5+
var element = $( "#progressbar" ).progressbar();
66

7-
(function($) {
7+
equal( element.attr( "role" ), "progressbar", "aria role" );
8+
equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
9+
equal( element.attr( "aria-valuemax" ), 100, "aria-valuemax" );
10+
equal( element.attr( "aria-valuenow" ), 0, "aria-valuenow initially" );
811

9-
module("progressbar: core");
12+
element.progressbar( "value", 77 );
13+
equal( element.attr( "aria-valuenow" ), 77, "aria-valuenow" );
1014

11-
test("accessibility", function() {
12-
expect(7);
13-
el = $("#progressbar").progressbar();
15+
element.progressbar( "disable" );
16+
equal( element.attr( "aria-disabled" ), "true", "aria-disabled on" );
1417

15-
equal(el.attr("role"), "progressbar", "aria role");
16-
equal(el.attr("aria-valuemin"), 0, "aria-valuemin");
17-
equal(el.attr("aria-valuemax"), 100, "aria-valuemax");
18-
equal(el.attr("aria-valuenow"), 0, "aria-valuenow initially");
19-
el.progressbar("value", 77);
20-
equal(el.attr("aria-valuenow"), 77, "aria-valuenow");
21-
el.progressbar("disable");
22-
equal(el.attr("aria-disabled"), "true", "aria-disabled on");
23-
el.progressbar("enable");
24-
// FAIL: for some reason IE6 and 7 return a boolean false instead of the string
25-
equal(el.attr("aria-disabled"), "false", "aria-disabled off");
18+
element.progressbar( "enable" );
19+
equal( element.attr( "aria-disabled" ), "false", "aria-disabled off" );
2620
});
27-
28-
})(jQuery);

‎tests/unit/progressbar/progressbar_events.js

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,43 @@
1-
/*
2-
* progressbar_events.js
3-
*/
4-
(function($) {
1+
module( "progressbar: events" );
52

6-
module("progressbar: events");
7-
8-
test("create", function() {
9-
expect(1);
10-
$("#progressbar").progressbar({
3+
test( "create", function() {
4+
expect( 1 );
5+
$( "#progressbar" ).progressbar({
116
value: 5,
127
create: function() {
13-
deepEqual(5, $(this).progressbar("value") );
8+
deepEqual( 5, $( this ).progressbar( "value" ) );
149
},
1510
change: function() {
16-
ok(false, 'create() has triggered change()');
11+
ok( false, "create() has triggered change()" );
1712
}
1813
});
1914
});
2015

21-
test("change", function() {
22-
expect(1);
23-
$("#progressbar").progressbar({
16+
test( "change", function() {
17+
expect( 1 );
18+
$( "#progressbar" ).progressbar({
2419
change: function() {
25-
deepEqual( 5, $(this).progressbar("value") );
20+
deepEqual( 5, $( this ).progressbar( "value" ) );
2621
}
27-
}).progressbar("value", 5);
22+
}).progressbar( "value", 5 );
2823
});
2924

3025
test( "complete", function() {
3126
expect( 3 );
32-
var changes = 0,
33-
value;
34-
35-
$( "#progressbar" ).progressbar({
36-
change: function() {
37-
changes++;
38-
deepEqual( $( this ).progressbar( "value" ), value, "change at " + value );
39-
},
40-
complete: function() {
41-
equal( changes, 2, "complete triggered after change" );
42-
}
43-
});
27+
var value,
28+
changes = 0,
29+
element = $( "#progressbar" ).progressbar({
30+
change: function() {
31+
changes++;
32+
deepEqual( element.progressbar( "value" ), value, "change at " + value );
33+
},
34+
complete: function() {
35+
equal( changes, 2, "complete triggered after change" );
36+
}
37+
});
4438

4539
value = 5;
46-
$( "#progressbar" ).progressbar( "value", value );
40+
element.progressbar( "value", value );
4741
value = 100;
48-
$( "#progressbar" ).progressbar( "value", value );
42+
element.progressbar( "value", value );
4943
});
50-
51-
})(jQuery);

‎tests/unit/progressbar/progressbar_methods.js

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,17 @@
1-
/*
2-
* progressbar_methods.js
3-
*/
4-
(function($) {
1+
module( "progressbar: methods" );
52

6-
module("progressbar: methods");
7-
8-
test("init", function() {
9-
expect(1);
10-
11-
$("<div></div>").appendTo('body').progressbar().remove();
12-
ok(true, '.progressbar() called on element');
13-
14-
});
15-
16-
test("destroy", function() {
17-
expect(2);
18-
19-
$("<div></div>").appendTo('body').progressbar().progressbar("destroy").remove();
20-
ok(true, '.progressbar("destroy") called on element');
21-
22-
var expected = $('<div></div>').progressbar(),
23-
actual = expected.progressbar('destroy');
24-
equal(actual, expected, 'destroy is chainable');
3+
test( "destroy", function() {
4+
expect( 1 );
5+
domEqual( "#progressbar", function() {
6+
$( "#progressbar" ).progressbar().progressbar( "destroy" );
7+
});
258
});
269

27-
test('value', function() {
28-
expect(3);
10+
test( "value", function() {
11+
expect( 3 );
2912

30-
var el = $('<div></div>').progressbar({ value: 20 });
31-
equal(el.progressbar('value'), 20, 'correct value as getter');
32-
equal(el.progressbar('value', 30), el, 'chainable as setter');
33-
equal(el.progressbar('option', 'value'), 30, 'correct value after setter');
13+
var element = $( "<div>" ).progressbar({ value: 20 });
14+
equal( element.progressbar( "value" ), 20, "correct value as getter" );
15+
equal( element.progressbar( "value", 30), element, "chainable as setter" );
16+
equal( element.progressbar( "option", "value" ), 30, "correct value after setter" );
3417
});
35-
36-
})(jQuery);

‎tests/unit/progressbar/progressbar_options.js

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
/*
2-
* progressbar_options.js
3-
*/
4-
(function($) {
1+
module( "progressbar: options" );
52

6-
module("progressbar: options");
7-
8-
test("{ value : 0 }, default", function() {
9-
$("#progressbar").progressbar();
10-
deepEqual( 0, $("#progressbar").progressbar("value") );
3+
test( "{ value : 0 }, default", function() {
4+
$( "#progressbar" ).progressbar();
5+
equal( 0, $( "#progressbar" ).progressbar( "value" ) );
116
});
127

138
// Ticket #7231 - valueDiv should be hidden when value is at 0%
@@ -16,44 +11,47 @@ test( "value: visibility of valueDiv", function() {
1611
var element = $( "#progressbar" ).progressbar({
1712
value: 0
1813
});
19-
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ), "valueDiv hidden when value is initialized at 0" );
14+
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
15+
"valueDiv hidden when value is initialized at 0" );
2016
element.progressbar( "value", 1 );
21-
ok( element.children( ".ui-progressbar-value" ).is( ":visible" ), "valueDiv visible when value is set to 1" );
17+
ok( element.children( ".ui-progressbar-value" ).is( ":visible" ),
18+
"valueDiv visible when value is set to 1" );
2219
element.progressbar( "value", 100 );
23-
ok( element.children( ".ui-progressbar-value" ).is( ":visible" ), "valueDiv visible when value is set to 100" );
20+
ok( element.children( ".ui-progressbar-value" ).is( ":visible" ),
21+
"valueDiv visible when value is set to 100" );
2422
element.progressbar( "value", 0 );
25-
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ), "valueDiv hidden when value is set to 0" );
23+
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
24+
"valueDiv hidden when value is set to 0" );
2625
element.progressbar( "value", -1 );
27-
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ), "valueDiv hidden when value set to -1 (normalizes to 0)" );
26+
ok( element.children( ".ui-progressbar-value" ).is( ":hidden" ),
27+
"valueDiv hidden when value set to -1 (normalizes to 0)" );
2828
});
2929

30-
test("{ value : 5 }", function() {
31-
$("#progressbar").progressbar({
30+
test( "{ value : 5 }", function() {
31+
$( "#progressbar" ).progressbar({
3232
value: 5
3333
});
34-
deepEqual( 5, $("#progressbar").progressbar("value") );
34+
equal( 5, $( "#progressbar" ).progressbar( "value" ) );
3535
});
3636

37-
test("{ value : -5 }", function() {
38-
$("#progressbar").progressbar({
37+
test( "{ value : -5 }", function() {
38+
$( "#progressbar" ).progressbar({
3939
value: -5
4040
});
41-
deepEqual( 0, $("#progressbar").progressbar("value") );
41+
deepEqual( 0, $( "#progressbar" ).progressbar( "value" ) );
4242
});
4343

44-
test("{ value : 105 }", function() {
45-
$("#progressbar").progressbar({
44+
test( "{ value : 105 }", function() {
45+
$( "#progressbar" ).progressbar({
4646
value: 105
4747
});
48-
deepEqual( 100, $("#progressbar").progressbar("value") );
48+
deepEqual( 100, $( "#progressbar" ).progressbar( "value" ) );
4949
});
5050

51-
test("{ max : 5, value : 10 }", function() {
51+
test( "{ max : 5, value : 10 }", function() {
5252
$("#progressbar").progressbar({
5353
max: 5,
5454
value: 10
5555
});
56-
deepEqual( 5, $("#progressbar").progressbar("value") );
56+
deepEqual( 5, $( "#progressbar" ).progressbar( "value" ) );
5757
});
58-
59-
})(jQuery);

0 commit comments

Comments
 (0)