Menu tests: More complete role option tests.

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 27c2fabb3c403f474894b8b36df0aff555ad0a63..a5df700261d685a64bcd51185df6180850596eb3 100644 (file)
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -40,7 +40,13 @@ test( "{ disabled: false }", function() {
        equal( logOutput(), "click,1,afterclick", "Click order not valid." );
 });
 
-test( "{ role: 'menu' } ", function () {
+// TODO: test icon option
+
+// TODO: test menus option
+
+// TODO: test position option
+
+test( "{ role: 'menu' } ", function() {
        var element = $( "#menu1" ).menu(),
                items = element.find( "li" );
        expect( 2 + 5 * items.length );
@@ -55,16 +61,37 @@ test( "{ role: 'menu' } ", function () {
        });
 });
 
-test( "{ role: 'listbox' } ", function () {
+test( "{ role: 'listbox' } ", function() {
        var element = $( "#menu1" ).menu({
                        role: "listbox"
                }),
                items = element.find( "li" );
-       expect( 2 + items.length );
+       expect( 2 + 5 * 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" ), "presentation", "menu item ("+ item + ") role" );
                equal( $( "a", this ).attr( "role" ), "option", "menu item ("+ item + ") role" );
+               ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" );
+               equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" );
+       });
+});
+
+test( "{ role: null }", function() {
+       var element = $( "#menu1" ).menu({
+                       role: null
+               }),
+               items = element.find( "li" );
+       expect( 2 + 5 * 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" ), "presentation", "menu item ("+ item + ") role" );
+               equal( $( "a", this ).attr( "role" ), undefined, "menu item ("+ item + ") role" );
+               ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" );
+               equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" );
        });
 });