Navigation Menu

Skip to content

Commit

Permalink
Menu: Update unit test that regressed from style changes (see 9910e93)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jzaefferer
jzaefferer committed Nov 15, 2013
1 parent 0e5a2e1 commit 3945a8f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion tests/unit/menu/menu_common.js
View file
Expand Up @@ -7,7 +7,7 @@ TestHelpers.commonWidgetTests( "menu", {
items: "> *", items: "> *",
menus: "ul", menus: "ul",
position: { position: {
my: "left top", my: "left-1 top",
at: "right top" at: "right top"
}, },
role: "menu", role: "menu",
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/menu/menu_events.js
View file
Expand Up @@ -389,15 +389,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" ); equal( logOutput(), "keydown,11", "Keydown PAGE_DOWN" );


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" ); equal( logOutput(), "keydown,22", "Keydown PAGE_DOWN" );


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
equal( logOutput(), "keydown,10", "Keydown PAGE_UP" ); equal( logOutput(), "keydown,11", "Keydown PAGE_UP" );


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
Expand Down Expand Up @@ -484,15 +484,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
function menukeyboard3() { function menukeyboard3() {
log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" ); equal( logOutput(), "keydown,11", "Keydown PAGE_DOWN" );


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" ); equal( logOutput(), "keydown,22", "Keydown PAGE_DOWN" );


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
equal( logOutput(), "keydown,10", "Keydown PAGE_UP" ); equal( logOutput(), "keydown,11", "Keydown PAGE_UP" );


log( "keydown", true ); log( "keydown", true );
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
Expand Down
9 changes: 3 additions & 6 deletions tests/unit/menu/menu_options.js
View file
Expand Up @@ -66,13 +66,12 @@ test( "{ icons: { submenu: 'custom' } }", function() {
test( "{ role: 'menu' } ", function() { test( "{ role: 'menu' } ", function() {
var element = $( "#menu1" ).menu(), var element = $( "#menu1" ).menu(),
items = element.find( "li" ); items = element.find( "li" );
expect( 2 + 4 * items.length ); expect( 2 + 3 * items.length );
equal( element.attr( "role" ), "menu" ); equal( element.attr( "role" ), "menu" );
ok( items.length > 0, "number of menu items" ); ok( items.length > 0, "number of menu items" );
items.each(function( item ) { items.each(function( item ) {
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
equal( $( this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" ); equal( $( this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" );
ok( $( this ).hasClass( "ui-corner-all" ), "class for menu item ("+ item + ")" );
equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" ); equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" );
}); });
}); });
Expand All @@ -82,13 +81,12 @@ test( "{ role: 'listbox' } ", function() {
role: "listbox" role: "listbox"
}), }),
items = element.find( "li" ); items = element.find( "li" );
expect( 2 + 4 * items.length ); expect( 2 + 3 * items.length );
equal( element.attr( "role" ), "listbox" ); equal( element.attr( "role" ), "listbox" );
ok( items.length > 0, "number of menu items" ); ok( items.length > 0, "number of menu items" );
items.each(function( item ) { items.each(function( item ) {
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
equal( $( this ).attr( "role" ), "option", "menu item ("+ item + ") role" ); equal( $( this ).attr( "role" ), "option", "menu item ("+ item + ") role" );
ok( $( this ).hasClass( "ui-corner-all" ), "class for menu item ("+ item + ")" );
equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" ); equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" );
}); });
}); });
Expand All @@ -98,13 +96,12 @@ test( "{ role: null }", function() {
role: null role: null
}), }),
items = element.find( "li" ); items = element.find( "li" );
expect( 2 + 4 * items.length ); expect( 2 + 3 * items.length );
strictEqual( element.attr( "role" ), undefined ); strictEqual( element.attr( "role" ), undefined );
ok( items.length > 0, "number of menu items" ); ok( items.length > 0, "number of menu items" );
items.each(function( item ) { items.each(function( item ) {
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
equal( $( this ).attr( "role" ), undefined, "menu item ("+ item + ") role" ); equal( $( this ).attr( "role" ), undefined, "menu item ("+ item + ") role" );
ok( $( this ).hasClass( "ui-corner-all" ), "class for menu item ("+ item + ")" );
equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" ); equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" );
}); });
}); });
Expand Down

0 comments on commit 3945a8f

Please sign in to comment.