|
1 | 1 | module( "progressbar: core" ); |
2 | 2 |
|
3 | 3 | test( "markup structure", function() { |
4 | | - expect( 12 ); |
| 4 | + expect( 7 ); |
5 | 5 | var element = $( "#progressbar" ).progressbar(), |
6 | 6 | 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" ); |
13 | 11 | 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" ); |
16 | 13 |
|
17 | 14 | ok( !element.hasClass( "ui-progressbar-indeterminate" ), |
18 | 15 | "main element is not .ui-progressbar-indeterminate" ); |
19 | 16 | 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" ), |
21 | 18 | "child is .ui-progressbar-value" ); |
22 | 19 | equal( element.children().children().length, 0, "no overlay div" ); |
23 | 20 | }); |
24 | 21 |
|
25 | 22 | test( "markup structure - indeterminate", function() { |
26 | | - expect( 5 ); |
| 23 | + expect( 4 ); |
27 | 24 | 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" ); |
31 | 27 | equal( element.children().length, 1, "main element contains one child" ); |
32 | 28 | ok( element.children().eq( 0 ).hasClass( "ui-progressbar-value" ), |
33 | 29 | "child is .ui-progressbar-value" ); |
|
0 commit comments