Skip to content

Commit a05db72

Browse files
Tests: Fixed tests after grunticon merge and theme tweaks.
1 parent a304e17 commit a05db72

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

tests/integration/collapsible/collapsible_core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,11 @@
292292
ok( collapsibles.eq(1).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-b" ), "Heading of second collapsible should have class ui-btn-b" );
293293
ok( !collapsibles.eq(1).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-c,.ui-body-d" ), "Content of second collapsible should NOT have class ui-body-[a,c,d]" );
294294
ok( collapsibles.eq(1).find( ".ui-collapsible-content" ).hasClass( "ui-body-b" ), "Content of second collapsible should have class ui-body-b" );
295-
deepEqual( collapsibles.eq(2).find( ".ui-collapsible-heading-toggle" ).css( "background-color" ), "rgb(221, 221, 221)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
295+
deepEqual( collapsibles.eq(2).find( ".ui-collapsible-heading-toggle" ).css( "background-color" ), "rgb(51, 51,51)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
296296
ok( !collapsibles.eq(2).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-b,.ui-body-c" ), "Content of third collapsible should NOT have class ui-body-[a,b,c]" );
297297
ok( collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of third collapsible should have class ui-body-d" );
298298
ok( !collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-collapsible-content-collapsed" ), "Content of third collapsible should NOT have class ui-collapsible-content-collapsed" );
299-
deepEqual( collapsibles.eq(3).find( ".ui-collapsible-heading-toggle" ).css( "background-color" ), "rgb(221, 221, 221)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
299+
deepEqual( collapsibles.eq(3).find( ".ui-collapsible-heading-toggle" ).css( "background-color" ), "rgb(51, 51,51)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
300300
ok( !collapsibles.eq(3).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-b,.ui-body-c" ), "Content of fourth collapsible should NOT have class ui-body-[a,b,c]" );
301301
ok( collapsibles.eq(3).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of fourth collapsible should have class ui-body-d" );
302302
start();

tests/integration/listview/listview_core.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@
8282
items = page.find( "li" );
8383

8484
ok( items.eq( 0 ).hasClass( "ui-li-has-count"), "First LI should have ui-li-has-count class" );
85-
ok( items.eq( 0 ).find( "a" ).first().hasClass( "ui-icon-arrow-r"), "First LI A should have ui-icon-arrow-r class" );
85+
ok( items.eq( 0 ).find( "a" ).first().hasClass( "ui-icon-carat-r"), "First LI A should have ui-icon-carat-r class" );
8686
ok( !items.eq( 1 ).hasClass( "ui-li-has-count"), "Second LI should NOT have ui-li-has-count class" );
87-
ok( items.eq( 1 ).find( "a" ).first().hasClass( "ui-icon-arrow-r"), "Second LI A should have ui-icon-arrow-r class" );
87+
ok( items.eq( 1 ).find( "a" ).first().hasClass( "ui-icon-carat-r"), "Second LI A should have ui-icon-carat-r class" );
8888
ok( !items.eq( 2 ).hasClass( "ui-li-has-count"), "Third LI should NOT have ui-li-has-count class" );
89-
ok( !items.eq( 2 ).find( "a" ).first().hasClass( "ui-icon-arrow-r"), "Third LI A should NOT have ui-icon-arrow-r class" );
89+
ok( !items.eq( 2 ).find( "a" ).first().hasClass( "ui-icon-carat-r"), "Third LI A should NOT have ui-icon-carat-r class" );
9090
ok( items.eq( 3 ).hasClass( "ui-li-has-count"), "Fourth LI should have ui-li-has-count class" );
91-
ok( !items.eq( 3 ).find( "a" ).first().hasClass( "ui-icon-arrow-r"), "Fourth LI A should NOT have ui-icon-arrow-r class" );
91+
ok( !items.eq( 3 ).find( "a" ).first().hasClass( "ui-icon-carat-r"), "Fourth LI A should NOT have ui-icon-carat-r class" );
9292
ok( !items.eq( 4 ).hasClass( "ui-li-has-count"), "Fifth LI should NOT have ui-li-has-count class" );
93-
ok( !items.eq( 4 ).find( "a" ).first().hasClass( "ui-icon-arrow-r"), "Fifth LI A should NOT have ui-icon-arrow-r class" );
93+
ok( !items.eq( 4 ).find( "a" ).first().hasClass( "ui-icon-carat-r"), "Fifth LI A should NOT have ui-icon-carat-r class" );
9494
ok( items.eq( 5 ).hasClass( "ui-li-has-alt"), "Sixth LI should have ui-li-has-alt class" );
9595
ok( items.eq( 6 ).hasClass( "ui-li-has-icon"), "Seventh LI should have ui-li-has-icon class" );
9696
ok( items.eq( 7 ).hasClass( "ui-li-has-thumb"), "Eight LI should have ui-li-has-thumb class" );

tests/unit/button/button_core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
var $inherited = $( "#theme-check" ),
3939
$explicit = $( "#theme-check-explicit" );
4040

41-
deepEqual( $inherited.css( "background-color" ), "rgb(221, 221, 221)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
41+
deepEqual( $inherited.css( "background-color" ), "rgb(51, 51,51)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
4242
ok( $explicit.hasClass( "ui-btn-a" ), "should not inherit" );
4343
});
4444

tests/unit/checkboxradio/checkboxradio_core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
var $inherited = $( "#checkbox-inherit-theme" ),
9595
$explicit = $( "#checkbox-explicit-theme" );
9696

97-
deepEqual( $inherited.siblings("label").css( "background-color" ), "rgb(221, 221, 221)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
97+
deepEqual( $inherited.siblings("label").css( "background-color" ), "rgb(51, 51,51)" ); /* The RGB value should match the background color we set for ui-btn-b in the default theme */
9898
ok( $explicit.siblings("label").hasClass( "ui-btn-b" ), "should not inherit" );
9999
});
100100

0 commit comments

Comments
 (0)