Menu tests: Better handling of async focus in IE.

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index a94968138e5c5eb2e5319d6fee913f5a64dbc00b..3c94a5a6c14238d026707a090390f8598d32c541 100644 (file)
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -87,7 +87,7 @@ asyncTest( "handle blur via click outside", function() {
        });
 });
 
-test( "handle focus of menu with active item", function() {
+asyncTest( "handle focus of menu with active item", function() {
        expect( 1 );
        var element = $( "#menu1" ).menu({
                focus: function( event ) {
@@ -96,11 +96,19 @@ test( "handle focus of menu with active item", function() {
        });
 
        log( "focus", true );
-       element.focus();
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-       element.focus();
-       equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
+       element[0].focus();
+       setTimeout(function() {
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+               element[0].blur();
+               setTimeout(function() {
+                       element[0].focus();
+                       setTimeout(function() {
+                               equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
+                               start();
+                       });
+               });
+       });
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
@@ -162,7 +170,7 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 });
 
 
-test( "handle keyboard navigation on menu without scroll and without submenus", function() {
+asyncTest( "handle keyboard navigation on menu without scroll and without submenus", function() {
        expect( 12 );
        var element = $( "#menu1" ).menu({
                select: function( event, ui ) {
@@ -174,54 +182,58 @@ test( "handle keyboard navigation on menu without scroll and without submenus",
        });
 
        log( "keydown", true );
-       element.focus();
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-       equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
+       element[0].focus();
+       setTimeout(function() {
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+               equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-       equal( logOutput(), "keydown,1", "Keydown UP" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+               equal( logOutput(), "keydown,1", "Keydown UP" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-       equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+               equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-       equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+               equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-       equal( logOutput(), "keydown,4", "Keydown PAGE_DOWN" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+               equal( logOutput(), "keydown,4", "Keydown PAGE_DOWN" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-       equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+               equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-       equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+               equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-       equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+               equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-       equal( logOutput(), "keydown,4", "Keydown END" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+               equal( logOutput(), "keydown,4", "Keydown END" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-       equal( logOutput(), "keydown,0", "Keydown HOME" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+               equal( logOutput(), "keydown,0", "Keydown HOME" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-       equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+               equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-       equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+               equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
+
+               start();
+       });
 });
 
 asyncTest( "handle keyboard navigation on menu without scroll and with submenus", function() {
@@ -344,7 +356,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
        }
 });
 
-test( "handle keyboard navigation on menu with scroll and without submenus", function() {
+asyncTest( "handle keyboard navigation on menu with scroll and without submenus", function() {
        expect( 14 );
        var element = $( "#menu3" ).menu({
                select: function( event, ui ) {
@@ -356,63 +368,67 @@ test( "handle keyboard navigation on menu with scroll and without submenus", fun
        });
 
        log( "keydown", true );
-       element.focus();
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
-       equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
+       element[0].focus();
+       setTimeout(function() {
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+               equal( logOutput(), "keydown,0,1,2", "Keydown DOWN" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
-       equal( logOutput(), "keydown,1,0", "Keydown UP" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+               equal( logOutput(), "keydown,1,0", "Keydown UP" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
-       equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+               equal( logOutput(), "keydown", "Keydown LEFT (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
-       equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+               equal( logOutput(), "keydown", "Keydown RIGHT (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-       equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+               equal( logOutput(), "keydown,10", "Keydown PAGE_DOWN" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-       equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+               equal( logOutput(), "keydown,20", "Keydown PAGE_DOWN" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-       equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+               equal( logOutput(), "keydown,10", "Keydown PAGE_UP" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-       equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+               equal( logOutput(), "keydown,0", "Keydown PAGE_UP" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
-       equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+               equal( logOutput(), "keydown", "Keydown PAGE_UP (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
-       equal( logOutput(), "keydown,37", "Keydown END" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+               equal( logOutput(), "keydown,37", "Keydown END" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
-       equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+               equal( logOutput(), "keydown", "Keydown PAGE_DOWN (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
-       equal( logOutput(), "keydown,0", "Keydown HOME" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+               equal( logOutput(), "keydown,0", "Keydown HOME" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
-       equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+               equal( logOutput(), "keydown", "Keydown ESCAPE (no effect)" );
 
-       log( "keydown", true );
-       element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
-       equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
+               log( "keydown", true );
+               element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+               equal( logOutput(), "keydown,Aberdeen", "Keydown ENTER" );
+
+               start();
+       });
 });
 
 asyncTest( "handle keyboard navigation on menu with scroll and with submenus", function() {
@@ -561,7 +577,7 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite
        }
 });
 
-test( "handle keyboard navigation with spelling of menu items", function() {
+asyncTest( "handle keyboard navigation with spelling of menu items", function() {
        expect( 2 );
        var element = $( "#menu2" ).menu({
                focus: function( event ) {
@@ -577,8 +593,9 @@ test( "handle keyboard navigation with spelling of menu items", function() {
                equal( logOutput(), "keydown,0,1,3", "Keydown focus Addyston by spelling the first 3 letters" );
                element.simulate( "keydown", { keyCode: 68 } );
                equal( logOutput(), "keydown,0,1,3,4", "Keydown focus Delphi by repeating the 'd' again" );
+               start();
        });
-       element.focus();
+       element[0].focus();
 });
 
 })( jQuery );