Menu: Tests for role option

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index f2de7ef1aae7b6035dfe249deedd84a198d5aa39..68b625687e3d65433457275fc2d24152d5adece2 100644 (file)
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -26,17 +26,4 @@ test("accessibility", function () {
        equal( menu.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
 });
 
-test("items class and role", function () {
-       var menu = $('#menu1').menu();
-       expect(1 + 5 * $("li",menu).length);
-       ok( ($("li",menu).length > 0 ), "number of menu items");
-       $("li",menu).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"), "menuitem", "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 + ") ");
-       });
-});
-
 })(jQuery);

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index e651fd2d11988ea9ead19f1fff1ff3f0d70bc96e..306f575ea64df0e14723d7a88ca881be663a8570 100644 (file)
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -38,4 +38,30 @@ test( "{ disabled: false }", function() {
        equal( $("#log").html(), "afterclick,1,click,", "Click order not valid.");
 });
 
+test("{ role: 'menu' } ", function () {
+       var menu = $('#menu1').menu();
+       expect(2 + 5 * $("li", menu).length);
+       equal( menu.attr( "role" ), "menu" );
+       ok( $("li", menu).length > 0, "number of menu items");
+       $("li", menu).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"), "menuitem", "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: 'listbox' } ", function () {
+       var menu = $('#menu1').menu({
+               role: "listbox"
+       });
+       expect(2 + $("li", menu).length);
+       equal( menu.attr( "role" ), "listbox" );
+       ok( ($("li", menu).length > 0 ), "number of menu items");
+       $("li", menu).each(function(item) {
+               equal( $("a", this).attr("role"), "option", "menu item ("+ item + ") role");
+       });
+});
+
 })(jQuery);