Menu: Update unit test that regressed from style changes (see 9910e938aad1090339a2c7f...

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 2404ebe020164b617bccdadbcf217b1fa030af85..099dd091e037b41dc591a3ca00db264c574b3090 100644 (file)
--- a/tests/unit/menu/menu_common.js
+++ b/tests/unit/menu/menu_common.js
@@ -7,7 +7,7 @@ TestHelpers.commonWidgetTests( "menu", {
                items: "> *",
                menus: "ul",
                position: {
-                       my: "left top",
+                       my: "left-1 top",
                        at: "right top"
                },
                role: "menu",

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 0b89b86ac7ec2f0fa5ea86ba999e71240f3b66b7..9d74b4bbb762551aed58a223cfecd9b3b6fd22f4 100644 (file)
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -389,15 +389,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"
 
                log( "keydown", true );
                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 );
                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 );
                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 );
                element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
@@ -484,15 +484,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
        function menukeyboard3() {
                log( "keydown", true );
                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 );
                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 );
                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 );
                element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 527cc478495334948f1ed7dfb259c8d61f647911..c766733458314d2630acabc8b75cebbe79ba60eb 100644 (file)
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -66,13 +66,12 @@ test( "{ icons: { submenu: 'custom' } }", function() {
 test( "{ role: 'menu' } ", function() {
        var element = $( "#menu1" ).menu(),
                items = element.find( "li" );
-       expect( 2 + 4 * items.length );
+       expect( 2 + 3 * items.length );
        equal( element.attr( "role" ), "menu" );
        ok( items.length > 0, "number of menu items" );
        items.each(function( item ) {
                ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
                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 + ")" );
        });
 });
@@ -82,13 +81,12 @@ test( "{ role: 'listbox' } ", function() {
                        role: "listbox"
                }),
                items = element.find( "li" );
-       expect( 2 + 4 * items.length );
+       expect( 2 + 3 * items.length );
        equal( element.attr( "role" ), "listbox" );
        ok( items.length > 0, "number of menu items" );
        items.each(function( item ) {
                ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
                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 + ")" );
        });
 });
@@ -98,13 +96,12 @@ test( "{ role: null }", function() {
                        role: null
                }),
                items = element.find( "li" );
-       expect( 2 + 4 * items.length );
+       expect( 2 + 3 * items.length );
        strictEqual( element.attr( "role" ), undefined );
        ok( items.length > 0, "number of menu items" );
        items.each(function( item ) {
                ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
                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 + ")" );
        });
 });