library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tests: Fix button space assertions on IE8

Browse Source 
IE8 still doesn't keep the space in the text (or HTML) representation.
We don't really care, so adding more trims in these tests as well.
This commit is contained in:
Jörn Zaefferer 2015-10-17 15:31:02 -04:00
parent 56d6ddc2ba
commit 3570cc5a2b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/dialog/options.js
View File

@ -165,7 +165,7 @@ test( "buttons - advanced", function( assert ) {
buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" ); buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
equal( buttons.length, 1, "correct number of buttons" ); equal( buttons.length, 1, "correct number of buttons" );
equal( buttons.attr( "id" ), "my-button-id", "correct id" ); equal( buttons.attr( "id" ), "my-button-id", "correct id" );
equal( buttons.text().trim(), "a button", "correct label" ); equal( $.trim( buttons.text() ), "a button", "correct label" );
assert.hasClasses( buttons, "additional-class" ); assert.hasClasses( buttons, "additional-class" );
deepEqual( buttons.button( "option", "icon" ), "ui-icon-cancel" ); deepEqual( buttons.button( "option", "icon" ), "ui-icon-cancel" );
equal( buttons.button( "option", "showLabel" ), false ); equal( buttons.button( "option", "showLabel" ), false );
@ -209,17 +209,17 @@ test( "closeText", function() {
expect( 3 ); expect( 3 );
var element = $( "<div></div>" ).dialog(); var element = $( "<div></div>" ).dialog();
equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text().trim(), "Close", equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "Close",
"default close text" ); "default close text" );
element.remove(); element.remove();
element = $( "<div></div>" ).dialog( { closeText: "foo" } ); element = $( "<div></div>" ).dialog( { closeText: "foo" } );
equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text().trim(), "foo", equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "foo",
"closeText on init" ); "closeText on init" );
element.remove(); element.remove();
element = $( "<div></div>" ).dialog().dialog( "option", "closeText", "bar" ); element = $( "<div></div>" ).dialog().dialog( "option", "closeText", "bar" );
equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text().trim(), "bar", equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "bar",
"closeText via option method" ); "closeText via option method" );
element.remove(); element.remove();
} ); } );

14
tests/unit/selectmenu/core.js
View File

@ -89,8 +89,8 @@ test( "_renderButtonItem()", function() {
element.selectmenu( "refresh" ); element.selectmenu( "refresh" );
option = element.find( "option:selected" ); option = element.find( "option:selected" );
equal( equal(
" " + option.text() + element[ 0 ].selectedIndex, $.trim( button.text() ),
button.text(), option.text() + element[ 0 ].selectedIndex,
"refresh: button item text" "refresh: button item text"
); );
@ -98,8 +98,8 @@ test( "_renderButtonItem()", function() {
menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" ); menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
option = element.find( "option" ).last(); option = element.find( "option" ).last();
equal( equal(
" " + option.text() + element[ 0 ].selectedIndex, $.trim( button.text() ),
button.text(), option.text() + element[ 0 ].selectedIndex,
"click: button item text" "click: button item text"
); );
} ); } );
@ -146,7 +146,7 @@ $.each( [
selected.val(), selected.val(),
"original select state" "original select state"
); );
equal( button.text(), " " + selected.text(), "button text" ); equal( $.trim( button.text() ), selected.text(), "button text" );
start(); start();
} ); } );
} ); } );
@ -181,7 +181,7 @@ $.each( [
selected.val(), selected.val(),
"original select state" "original select state"
); );
equal( button.text(), " " + selected.text(), "button text" ); equal( $.trim( button.text() ), selected.text(), "button text" );
start(); start();
}, 1 ); }, 1 );
} ); } );
@ -222,7 +222,7 @@ $.each( [
"button aria-activedescendant" ); "button aria-activedescendant" );
equal( element.find( "option:selected" ).val(), options.eq( 1 ).val(), equal( element.find( "option:selected" ).val(), options.eq( 1 ).val(),
"original select state" ); "original select state" );
equal( button.text(), " " + options.eq( 1 ).text(), "button text" ); equal( $.trim( button.text() ), options.eq( 1 ).text(), "button text" );
start(); start();
} ); } );
} ); } );

8
tests/unit/selectmenu/methods.js
View File

@ -81,21 +81,21 @@ asyncTest( "refresh - change selected option", function() {
var element = $( "#speed" ).selectmenu(), var element = $( "#speed" ).selectmenu(),
button = element.selectmenu( "widget" ); button = element.selectmenu( "widget" );
equal( button.text(), " Medium", "button text after init" ); equal( $.trim( button.text() ), "Medium", "button text after init" );
button.simulate( "focus" ); button.simulate( "focus" );
setTimeout( function() { setTimeout( function() {
equal( button.text(), " Medium", "button text after focus" ); equal( $.trim( button.text() ), "Medium", "button text after focus" );
element[ 0 ].selectedIndex = 0; element[ 0 ].selectedIndex = 0;
element.selectmenu( "refresh" ); element.selectmenu( "refresh" );
equal( button.text(), " Slower", "button text after changing selected option" ); equal( $.trim( button.text() ), "Slower", "button text after changing selected option" );
element.find( "option" ).prop( "selected", false ); element.find( "option" ).prop( "selected", false );
element.append( "<option selected value=\"selected_option\">Selected option</option>" ); element.append( "<option selected value=\"selected_option\">Selected option</option>" );
element.selectmenu( "refresh" ); element.selectmenu( "refresh" );
equal( button.text(), " Selected option", "button text after adding selected option" ); equal( $.trim( button.text() ), "Selected option", "button text after adding selected option" );
start(); start();
} ); } );