Menu: Fix unit tests and set the right menu1-activedescendant attribute

diff --git a/tests/unit/index.html b/tests/unit/index.html
index f45499c2b862c478ed5413ce460ca3e149052297..a677023dc2039b437eaba115dc0194e64b74f986 100644 (file)
--- a/tests/unit/index.html
+++ b/tests/unit/index.html
@@ -46,8 +46,10 @@
        <li><a href="button/button.html">Button</a></li>
        <li><a href="datepicker/datepicker.html">Datepicker</a></li>
        <li><a href="dialog/dialog.html">Dialog</a></li>
+       <li><a href="menu/menu.html">Menu</a></li>
        <li><a href="progressbar/progressbar.html">Progressbar</a></li>
        <li><a href="slider/slider.html">Slider</a></li>
+       <li><a href="spinner/spinner.html">Spinner</a></li>
        <li><a href="tabs/tabs.html">Tabs</a></li>
        <li><a href="tooltip/tooltip.html">Tooltip</a></li>
 </ul>

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index a1cf11b7f72747d34ab65d5ed627edeaa615cd7d..42a661d0500976a5fe7145b6e9d14cce3028db6c 100644 (file)
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -8,13 +8,19 @@
 module("menu: core");
 
 test("accessibility", function () {
-       expect(3);
+       expect(5);
        var ac = $('#menu1').menu();
        var item0 = $("li:eq(0) a");
 
        ok( ac.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
        equals( ac.attr("role"), "listbox", "main role");
-       equals( ac.attr("aria-activedescendant"), "ui-active-menuitem", "aria attribute");
+       equals( ac.attr("aria-activedescendant"), undefined, "aria attribute not yet active");
+       var item = ac.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
+       ac.menu( "activate", $.Event(), item );
+       equals( ac.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
+       var item = ac.find( "li:last" );
+       ac.menu( "activate", $.Event(), item );
+       equals( ac.attr("aria-activedescendant"), "menu1-activedescendant", "aria attribute, generated id");
 });
 
 test("items class and role", function () {

diff --git a/tests/unit/menu/menu_defaults.js b/tests/unit/menu/menu_defaults.js
index c3f741d2a8fe779ec5e9c06d39c0c0950e375774..33102095970b1cd1170fd49fac34f85849c23799 100644 (file)
--- a/tests/unit/menu/menu_defaults.js
+++ b/tests/unit/menu/menu_defaults.js
@@ -3,9 +3,7 @@
  */
 
 var menu_defaults = {
-       disabled: false,
-       navigationFilter: function() {}
-       
+       disabled: false
 };
 
 commonWidgetTests('menu', { defaults: menu_defaults });

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 84ea843841469a9a32b18d25ae6ede860589f01a..b2e9e6157c5fa21dfae7a7469faced03e24d047f 100644 (file)
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -146,7 +146,7 @@ $.widget("ui.menu", {
                        .end();
                // need to remove the attribute before adding it for the screenreader to pick up the change
                // see http://groups.google.com/group/jquery-a11y/msg/929e0c1e8c5efc8f
-               this.element.removeAttr("aria-activedescenant").attr("aria-activedescenant", self.itemId);
+               this.element.removeAttr("aria-activedescendant").attr("aria-activedescendant", self.itemId);
                this._trigger( "focus", event, { item: item } );
        },