Skip to content

Commit 3945a8f

Browse files
committed
Menu: Update unit test that regressed from style changes (see 9910e93)
1 parent 0e5a2e1 commit 3945a8f

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

tests/unit/menu/menu_common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TestHelpers.commonWidgetTests( "menu", {
77
items: "> *",
88
menus: "ul",
99
position: {
10-
my: "left top",
10+
my: "left-1 top",
1111
at: "right top"
1212
},
1313
role: "menu",

tests/unit/menu/menu_events.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"
389389

390390
log( "keydown", true );
391391
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
392-
equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" );
392+
equal( logOutput(), "keydown,11", "Keydown PAGE_DOWN" );
393393

394394
log( "keydown", true );
395395
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
396-
equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" );
396+
equal( logOutput(), "keydown,22", "Keydown PAGE_DOWN" );
397397

398398
log( "keydown", true );
399399
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
400-
equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
400+
equal( logOutput(), "keydown,11", "Keydown PAGE_UP" );
401401

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

489489
log( "keydown", true );
490490
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
491-
equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" );
491+
equal( logOutput(), "keydown,22", "Keydown PAGE_DOWN" );
492492

493493
log( "keydown", true );
494494
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
495-
equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
495+
equal( logOutput(), "keydown,11", "Keydown PAGE_UP" );
496496

497497
log( "keydown", true );
498498
element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );

tests/unit/menu/menu_options.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,12 @@ test( "{ icons: { submenu: 'custom' } }", function() {
6666
test( "{ role: 'menu' } ", function() {
6767
var element = $( "#menu1" ).menu(),
6868
items = element.find( "li" );
69-
expect( 2 + 4 * items.length );
69+
expect( 2 + 3 * items.length );
7070
equal( element.attr( "role" ), "menu" );
7171
ok( items.length > 0, "number of menu items" );
7272
items.each(function( item ) {
7373
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
7474
equal( $( this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" );
75-
ok( $( this ).hasClass( "ui-corner-all" ), "class for menu item ("+ item + ")" );
7675
equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" );
7776
});
7877
});
@@ -82,13 +81,12 @@ test( "{ role: 'listbox' } ", function() {
8281
role: "listbox"
8382
}),
8483
items = element.find( "li" );
85-
expect( 2 + 4 * items.length );
84+
expect( 2 + 3 * items.length );
8685
equal( element.attr( "role" ), "listbox" );
8786
ok( items.length > 0, "number of menu items" );
8887
items.each(function( item ) {
8988
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
9089
equal( $( this ).attr( "role" ), "option", "menu item ("+ item + ") role" );
91-
ok( $( this ).hasClass( "ui-corner-all" ), "class for menu item ("+ item + ")" );
9290
equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" );
9391
});
9492
});
@@ -98,13 +96,12 @@ test( "{ role: null }", function() {
9896
role: null
9997
}),
10098
items = element.find( "li" );
101-
expect( 2 + 4 * items.length );
99+
expect( 2 + 3 * items.length );
102100
strictEqual( element.attr( "role" ), undefined );
103101
ok( items.length > 0, "number of menu items" );
104102
items.each(function( item ) {
105103
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
106104
equal( $( this ).attr( "role" ), undefined, "menu item ("+ item + ") role" );
107-
ok( $( this ).hasClass( "ui-corner-all" ), "class for menu item ("+ item + ")" );
108105
equal( $( this ).attr( "tabindex" ), "-1", "tabindex for menu item ("+ item + ")" );
109106
});
110107
});

0 commit comments

Comments
 (0)