Skip to content

Commit 21fbfa3

Browse files
committed
Progressbar: simplify tests for classes
1 parent 758ff6c commit 21fbfa3

1 file changed

Lines changed: 10 additions & 14 deletions

File tree

tests/unit/progressbar/progressbar_core.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
module( "progressbar: core" );
22

33
test( "markup structure", function() {
4-
expect( 12 );
4+
expect( 7 );
55
var element = $( "#progressbar" ).progressbar(),
66
value = element.children().eq( 0 );
7-
ok( element.hasClass( "ui-progressbar" ), "main element is .ui-progressbar" );
8-
ok( element.hasClass( "ui-widget" ), "main element is .ui-widget" );
9-
ok( element.hasClass( "ui-widget-content" ), "main element is .ui-widget-content" );
10-
ok( element.hasClass( "ui-corner-all" ), "main element is .ui-corner-all" );
11-
ok( !value.hasClass( "ui-progressbar-complete" ), "value is not .ui-progressbar-complete" );
12-
ok( !value.hasClass( "ui-corner-right" ), "value is not .ui-corner-right" );
7+
ok( element.is( ".ui-progressbar.ui-widget.ui-widget-content.ui-corner-all" ),
8+
"main element has proper classes" );
9+
ok( !value.is( ".ui-progressbar-complete.ui-corner-right" ),
10+
"value does not have ui-corner-right or ui-progressbar-complete" );
1311
element.progressbar( "option", "value", 100 );
14-
ok( value.hasClass( "ui-progressbar-complete" ), "value is .ui-progressbar-complete" );
15-
ok( value.hasClass( "ui-corner-right" ), "value is .ui-corner-right" );
12+
ok( value.is( ".ui-progressbar-complete.ui-corner-right" ), "value has proper classes" );
1613

1714
ok( !element.hasClass( "ui-progressbar-indeterminate" ),
1815
"main element is not .ui-progressbar-indeterminate" );
1916
equal( element.children().length, 1, "main element contains one child" );
20-
ok( element.children().eq( 0 ).hasClass( "ui-progressbar-value" ),
17+
ok( element.children().eq( 0 ).is( ".ui-progressbar-value" ),
2118
"child is .ui-progressbar-value" );
2219
equal( element.children().children().length, 0, "no overlay div" );
2320
});
2421

2522
test( "markup structure - indeterminate", function() {
26-
expect( 5 );
23+
expect( 4 );
2724
var element = $( "#progressbar" ).progressbar({ value: false });
28-
ok( element.hasClass( "ui-progressbar" ), "main element is .ui-progressbar" );
29-
ok( element.hasClass( "ui-progressbar-indeterminate" ),
30-
"main element is .ui-progressbar-indeterminate" );
25+
ok( element.is( ".ui-progressbar.ui-progressbar-indeterminate" ),
26+
"main element has proper classes" );
3127
equal( element.children().length, 1, "main element contains one child" );
3228
ok( element.children().eq( 0 ).hasClass( "ui-progressbar-value" ),
3329
"child is .ui-progressbar-value" );

0 commit comments

Comments
 (0)