aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/accordion/accordion_defaults.js2
-rw-r--r--tests/unit/accordion/accordion_defaults_deprecated.js1
-rw-r--r--tests/unit/accordion/accordion_events.js39
-rw-r--r--tests/unit/accordion/accordion_options.js2
-rw-r--r--tests/unit/accordion/accordion_test_helpers.js6
-rw-r--r--tests/unit/autocomplete/autocomplete_core.js43
-rw-r--r--tests/unit/autocomplete/autocomplete_events.js5
-rw-r--r--tests/unit/autocomplete/autocomplete_methods.js11
-rw-r--r--tests/unit/autocomplete/autocomplete_options.js54
-rw-r--r--tests/unit/menu/menu_core.js28
-rw-r--r--tests/unit/menu/menu_events.js325
-rw-r--r--tests/unit/menu/menu_methods.js30
-rw-r--r--tests/unit/menu/menu_options.js28
-rw-r--r--tests/unit/tabs/tabs_deprecated.js10
-rw-r--r--tests/unit/widget/widget_core.js45
15 files changed, 410 insertions, 219 deletions
diff --git a/tests/unit/accordion/accordion_defaults.js b/tests/unit/accordion/accordion_defaults.js
index 9aa58e650..9ad85bbce 100644
--- a/tests/unit/accordion/accordion_defaults.js
+++ b/tests/unit/accordion/accordion_defaults.js
@@ -1,7 +1,7 @@
commonWidgetTests( "accordion", {
defaults: {
active: 0,
- animated: "slide",
+ animate: {},
collapsible: false,
disabled: false,
event: "click",
diff --git a/tests/unit/accordion/accordion_defaults_deprecated.js b/tests/unit/accordion/accordion_defaults_deprecated.js
index 3f45a1f10..99f5ac827 100644
--- a/tests/unit/accordion/accordion_defaults_deprecated.js
+++ b/tests/unit/accordion/accordion_defaults_deprecated.js
@@ -1,6 +1,7 @@
commonWidgetTests( "accordion", {
defaults: {
active: 0,
+ animate: null,
animated: "slide",
autoHeight: true,
clearStyle: false,
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 12acf2a44..b5c3ea228 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -2,6 +2,45 @@
module( "accordion: events", accordion_setupTeardown() );
+test( "create", function() {
+ expect( 10 );
+
+ var element = $( "#list1" ),
+ headers = element.children( "h3" ),
+ contents = headers.next();
+
+ element.accordion({
+ create: function( event, ui ) {
+ equals( ui.header.size(), 1, "header size" );
+ strictEqual( ui.header[ 0 ], headers[ 0 ], "header" );
+ equals( ui.content.size(), 1, "content size" );
+ strictEqual( ui.content[ 0 ], contents[ 0 ], "content" );
+ }
+ });
+ element.accordion( "destroy" );
+
+ element.accordion({
+ active: 2,
+ create: function( event, ui ) {
+ equals( ui.header.size(), 1, "header size" );
+ strictEqual( ui.header[ 0 ], headers[ 2 ], "header" );
+ equals( ui.content.size(), 1, "content size" );
+ strictEqual( ui.content[ 0 ], contents[ 2 ], "content" );
+ }
+ });
+ element.accordion( "destroy" );
+
+ element.accordion({
+ active: false,
+ collapsible: true,
+ create: function( event, ui ) {
+ equals( ui.header.size(), 0, "header size" );
+ equals( ui.content.size(), 0, "content size" );
+ }
+ });
+ element.accordion( "destroy" );
+});
+
test( "beforeActivate", function() {
expect( 38 );
var element = $( "#list1" ).accordion({
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index a60bb27e1..8206b1d62 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -255,7 +255,7 @@ test( "{ icons: false }", function() {
var element = $( "#list1" );
function icons( on ) {
deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 );
- deepEqual( element.hasClass( "ui-accordion-icons" ), on );
+ deepEqual( element.find( ".ui-accordion-header.ui-accordion-icons" ).length, on ? 3 : 0 );
}
element.accordion();
icons( true );
diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/accordion_test_helpers.js
index 66d60a469..7b316e983 100644
--- a/tests/unit/accordion/accordion_test_helpers.js
+++ b/tests/unit/accordion/accordion_test_helpers.js
@@ -18,13 +18,13 @@ function accordion_equalHeights( accordion, min, max ) {
}
function accordion_setupTeardown() {
- var animated = $.ui.accordion.prototype.options.animated;
+ var animate = $.ui.accordion.prototype.options.animate;
return {
setup: function() {
- $.ui.accordion.prototype.options.animated = false;
+ $.ui.accordion.prototype.options.animate = false;
},
teardown: function() {
- $.ui.accordion.prototype.options.animated = animated;
+ $.ui.accordion.prototype.options.animate = animate;
}
};
}
diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js
index d98f56abf..ef6ea58af 100644
--- a/tests/unit/autocomplete/autocomplete_core.js
+++ b/tests/unit/autocomplete/autocomplete_core.js
@@ -2,45 +2,6 @@
module( "autocomplete: core" );
-asyncTest( "close-on-blur is properly delayed", function() {
- expect( 3 );
- var element = $( "#autocomplete" )
- .autocomplete({
- source: [ "java", "javascript" ]
- })
- .val( "ja" )
- .autocomplete( "search" ),
- menu = element.autocomplete( "widget" );
-
- ok( menu.is( ":visible" ) );
- element.blur();
- ok( menu.is( ":visible" ) );
- setTimeout(function() {
- ok( menu.is( ":hidden") );
- start();
- }, 200 );
-});
-
-asyncTest( "close-on-blur is cancelled when starting a search", function() {
- expect( 3 );
- var element = $( "#autocomplete" )
- .autocomplete({
- source: [ "java", "javascript" ]
- })
- .val( "ja" )
- .autocomplete( "search" ),
- menu = element.autocomplete( "widget" );
-
- ok( menu.is( ":visible" ) );
- element.blur();
- ok( menu.is( ":visible" ) );
- element.autocomplete( "search" );
- setTimeout(function() {
- ok( menu.is( ":visible" ) );
- start();
- }, 200 );
-});
-
test( "prevent form submit on enter when menu is active", function() {
expect( 2 );
var event,
@@ -162,8 +123,4 @@ test( "allow form submit on enter when menu is not active", function() {
}
})();
-(function() {
-
-})();
-
}( jQuery ) );
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index 7b51ec4c0..1c7ff7462 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -68,7 +68,10 @@ $.each([
ok( menu.is( ":visible" ), "menu is visible after delay" );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
- element.simulate( "blur" );
+ // blur must be async for IE to handle it properly
+ setTimeout(function() {
+ element.simulate( "blur" );
+ }, 1 );
}, 50 );
});
});
diff --git a/tests/unit/autocomplete/autocomplete_methods.js b/tests/unit/autocomplete/autocomplete_methods.js
index 3fe035d28..1600d73dc 100644
--- a/tests/unit/autocomplete/autocomplete_methods.js
+++ b/tests/unit/autocomplete/autocomplete_methods.js
@@ -9,15 +9,19 @@ test( "destroy", function() {
});
});
-test( "search", function() {
- expect( 3 );
+test( "search, close", function() {
+ expect( 6 );
var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ],
element = $( "#autocomplete" ).autocomplete({
source: data,
minLength: 0
}),
menu = element.autocomplete( "widget" );
+
+ ok( menu.is( ":hidden" ), "menu is hidden on init" );
+
element.autocomplete( "search" );
+ ok( menu.is( ":visible" ), "menu is visible after search" );
equal( menu.find( ".ui-menu-item" ).length, data.length, "all items for a blank search" );
element.val( "has" ).autocomplete( "search" );
@@ -25,6 +29,9 @@ test( "search", function() {
element.autocomplete( "search", "ja" );
equal( menu.find( ".ui-menu-item" ).length, 2, "only java and javascript for 'ja'" );
+
+ element.autocomplete( "close" );
+ ok( menu.is( ":hidden" ), "menu is hidden after close" );
});
}( jQuery ) );
diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js
index 114e9a42b..1ab40f36c 100644
--- a/tests/unit/autocomplete/autocomplete_options.js
+++ b/tests/unit/autocomplete/autocomplete_options.js
@@ -102,6 +102,60 @@ test( "minLength", function() {
ok( menu.is( ":visible" ), "blank enough for minLength: 0" );
});
+asyncTest( "minLength, exceed then drop below", function() {
+ expect( 4 );
+ var element = $( "#autocomplete" ).autocomplete({
+ minLength: 2,
+ source: function( req, res ) {
+ equal( req.term, "12", "correct search term" );
+ setTimeout(function() {
+ res([ "item" ]);
+ }, 1 );
+ }
+ }),
+ menu = element.autocomplete( "widget" );
+
+ ok( menu.is( ":hidden" ), "menu is hidden before first search" );
+ element.autocomplete( "search", "12" );
+
+ ok( menu.is( ":hidden" ), "menu is hidden before second search" );
+ element.autocomplete( "search", "1" );
+
+ setTimeout(function() {
+ ok( menu.is( ":hidden" ), "menu is hidden after searches" );
+ start();
+ }, 50 );
+});
+
+test( "minLength, exceed then drop below then exceed", function() {
+ expect( 3 );
+ var _res = [],
+ element = $( "#autocomplete" ).autocomplete({
+ minLength: 2,
+ source: function( req, res ) {
+ _res.push( res );
+ }
+ }),
+ menu = element.autocomplete( "widget" );
+
+ // trigger a valid search
+ ok( menu.is( ":hidden" ), "menu is hidden before first search" );
+ element.autocomplete( "search", "12" );
+
+ // trigger a search below the minLength, to turn on cancelSearch flag
+ ok( menu.is( ":hidden" ), "menu is hidden before second search" );
+ element.autocomplete( "search", "1" );
+
+ // trigger a valid search
+ element.autocomplete( "search", "13" );
+ // react as if the first search was cancelled (default ajax behavior)
+ _res[ 0 ]([]);
+ // react to second search
+ _res[ 1 ]([ "13" ]);
+
+ ok( menu.is( ":visible" ), "menu is visible after searches" );
+});
+
test( "source, local string array", function() {
expect( 1 );
var element = $( "#autocomplete" ).autocomplete({
diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index c0feae75c..bccf4a1f2 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -9,27 +9,27 @@ module("menu: core");
test("accessibility", function () {
expect(5);
- var ac = $('#menu1').menu();
+ var menu = $('#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"), "menu", "main role");
- ok( !ac.attr("aria-activedescendant"), "aria attribute not yet active");
+ ok( menu.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
+ equals( menu.attr("role"), "menu", "main role");
+ ok( !menu.attr("aria-activedescendant"), "aria attribute not yet active");
- var item = ac.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
- ac.menu( "focus", $.Event(), item );
- equals( ac.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
+ var item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
+ menu.menu( "focus", $.Event(), item );
+ equals( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
- var item = ac.find( "li:last" );
- ac.menu( "focus", $.Event(), item );
- equals( ac.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
+ var item = menu.find( "li:last" );
+ menu.menu( "focus", $.Event(), item );
+ equals( menu.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
});
test("items class and role", function () {
- var ac = $('#menu1').menu();
- expect(1 + 5 * $("li",ac).length);
- ok( ($("li",ac).length > 0 ), "number of menu items");
- $("li",ac).each(function(item) {
+ 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");
equals( $(this).attr("role"), "presentation", "menu item ("+ item + ") role");
equals( $("a", this).attr("role"), "menuitem", "menu item ("+ item + ") role");
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 9e68e0c67..6b03efb3c 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -7,7 +7,7 @@ module("menu: events");
test("handle click on menu", function() {
expect(1);
- var ac = $('#menu1').menu({
+ var menu = $('#menu1').menu({
select: function(event, ui) {
menu_log();
}
@@ -15,15 +15,15 @@ test("handle click on menu", function() {
menu_log("click",true);
menu_click($('#menu1'),"1");
menu_log("afterclick");
- menu_click( ac,"2");
+ menu_click( menu,"2");
menu_click($('#menu1'),"3");
- menu_click( ac,"1");
+ menu_click( menu,"1");
equals( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
});
test("handle click on custom item menu", function() {
expect(1);
- var ac = $('#menu5').menu({
+ var menu = $('#menu5').menu({
select: function(event, ui) {
menu_log();
},
@@ -32,9 +32,9 @@ test("handle click on custom item menu", function() {
menu_log("click",true);
menu_click($('#menu5'),"1");
menu_log("afterclick");
- menu_click( ac,"2");
+ menu_click( menu,"2");
menu_click($('#menu5'),"3");
- menu_click( ac,"1");
+ menu_click( menu,"1");
equals( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
});
@@ -87,48 +87,55 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
var $menu = $( "#menu2" ).menu();
$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
- setTimeout(function() {
+ setTimeout( menumouseleave1, 350 );
+
+ function menumouseleave1() {
equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
$menu.find( "li:nth-child(7) li:first" ).trigger( "mouseover" );
- setTimeout(function() {
- equal( $menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
- $menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
- setTimeout(function() {
- equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
- $menu.trigger( "mouseleave" );
- setTimeout(function() {
- equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
- start();
- }, 1400);
- }, 1050);
- }, 700);
- }, 350);
+ setTimeout( menumouseleave2, 350 );
+ }
+ function menumouseleave2() {
+ equal( $menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+ $menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
+ setTimeout( menumouseleave3, 350 );
+ }
+ function menumouseleave3() {
+ equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+ $menu.trigger( "mouseleave" );
+ setTimeout( menumouseleave4, 350 );
+ }
+ function menumouseleave4() {
+ equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+ start();
+ }
});
-asyncTest( "handle custom menu item submenu auto collapse: mouseleave", function() {
- expect( 5 );
+asyncTest( "handle submenu auto collapse: mouseleave", function() {
+ expect( 4 );
var $menu = $( "#menu5" ).menu( { menus: "div" } );
- $menu.children( ":nth-child(7)" ).trigger( "mouseover" );
- setTimeout(function() {
+ $menu.find( ":nth-child(7)" ).trigger( "mouseover" );
+ setTimeout( menumouseleave1, 350 );
+
+ function menumouseleave1() {
equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
- $menu.children( ":nth-child(7)" ).find( "div:first" ).children( ":first" ).trigger( "mouseover" );
- setTimeout(function() {
- equal( $menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
- $menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
- setTimeout(function() {
- equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
- $menu.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN });
- ok( $menu.find( ".ui-state-active" ).is( "#menu5 :nth-child(7) a" ),
- "down keypress selected an item from the first submenu" );
- $menu.trigger( "mouseleave" );
- setTimeout(function() {
- equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
- start();
- }, 1400);
- }, 1050);
- }, 700);
- }, 350);
+ $menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ).trigger( "mouseover" );
+ setTimeout( menumouseleave2, 350 );
+ }
+ function menumouseleave2() {
+ equal( $menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
+ $menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
+ setTimeout( menumouseleave3, 350 );
+ }
+ function menumouseleave3() {
+ equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
+ $menu.trigger( "mouseleave" );
+ setTimeout( menumouseleave4, 350 );
+ }
+ function menumouseleave4() {
+ equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
+ start();
+ }
});
@@ -144,13 +151,14 @@ test("handle keyboard navigation on menu without scroll and without submenus", f
});
menu_log("keydown",true);
+ element.focus();
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+ equals( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
menu_log("keydown",true);
element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
- equals( $("#log").html(), "0,keydown,", "Keydown UP");
+ equals( $("#log").html(), "1,keydown,", "Keydown UP");
menu_log("keydown",true);
element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
@@ -205,81 +213,90 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
});
menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+ element.one( "menufocus", function( event, ui ) {
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ equals( $("#log").html(), "2,1,keydown,", "Keydown DOWN");
+ setTimeout( menukeyboard1, 50 );
+ });
+ element.focus();
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
- equals( $("#log").html(), "0,keydown,", "Keydown UP");
+ function menukeyboard1() {
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+ equals( $("#log").html(), "0,1,keydown,", "Keydown UP");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
- equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+ equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
- setTimeout( function() {
- equals( $("#log").html(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)");
- }, 50);
+ setTimeout( function() {
+ equals( $("#log").html(), "0,4,3,2,1,keydown,", "Keydown RIGHT (open submenu)");
+ }, 50);
+ setTimeout( menukeyboard2, 50 );
+ }
- setTimeout( function() {
+ function menukeyboard2() {
menu_log("keydown",true);
element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
equals( $("#log").html(), "4,keydown,", "Keydown LEFT (close submenu)");
//re-open submenu
element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+ setTimeout( menukeyboard3, 50 );
+ }
- setTimeout( function() {
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
- equals( $("#log").html(), "2,keydown,", "Keydown PAGE_DOWN");
-
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
- equals( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
+ function menukeyboard3() {
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+ equals( $("#log").html(), "2,keydown,", "Keydown PAGE_DOWN");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
- equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+ equals( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
- equals( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+ equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
- equals( $("#log").html(), "2,keydown,", "Keydown END");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+ equals( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
- equals( $("#log").html(), "0,keydown,", "Keydown HOME");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+ equals( $("#log").html(), "2,keydown,", "Keydown END");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
- equals( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+ equals( $("#log").html(), "0,keydown,", "Keydown HOME");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+ equals( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
- setTimeout( function() {
- equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+ setTimeout( menukeyboard4, 50 );
+ }
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
- equals( $("#log").html(), "Ada,keydown,", "Keydown ENTER (select item)");
+ function menukeyboard4() {
+ equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
- start();
- }, 200);
- }, 150);
- }, 100);
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+ equals( $("#log").html(), "Ada,keydown,", "Keydown ENTER (select item)");
+ start();
+ }
});
test("handle keyboard navigation on menu with scroll and without submenus", function() {
@@ -294,13 +311,15 @@ test("handle keyboard navigation on menu with scroll and without submenus", func
});
menu_log("keydown",true);
+ element.focus();
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+ equals( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
menu_log("keydown",true);
element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
- equals( $("#log").html(), "0,keydown,", "Keydown UP");
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+ equals( $("#log").html(), "0,1,keydown,", "Keydown UP");
menu_log("keydown",true);
element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
@@ -363,78 +382,88 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
});
menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- equals( $("#log").html(), "1,0,keydown,", "Keydown DOWN");
+ element.one( "menufocus", function( event, ui ) {
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ equals( $("#log").html(), "2,1,keydown,", "Keydown DOWN");
+ setTimeout( menukeyboard1, 50 );
+ });
+ element.focus();
+
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
- equals( $("#log").html(), "0,keydown,", "Keydown UP");
+ function menukeyboard1() {
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
+ equals( $("#log").html(), "0,1,keydown,", "Keydown UP");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
- equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+ equals( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
- element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
- setTimeout( function() {
- equals( $("#log").html(), "0,1,keydown,", "Keydown RIGHT (open submenu)");
- }, 50);
+ setTimeout( function() {
+ equals( $("#log").html(), "0,1,keydown,", "Keydown RIGHT (open submenu)");
+ }, 50);
+ setTimeout( menukeyboard2, 50 );
+ }
- setTimeout( function() {
+ function menukeyboard2() {
menu_log("keydown",true);
element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
equals( $("#log").html(), "1,keydown,", "Keydown LEFT (close submenu)");
//re-open submenu
element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+ setTimeout( menukeyboard3, 50 );
+ }
- setTimeout( function() {
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
- equals( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
-
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
- equals( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
+ function menukeyboard3() {
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+ equals( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
- equals( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
+ equals( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
- equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+ equals( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
- equals( $("#log").html(), "27,keydown,", "Keydown END");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
+ equals( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
- equals( $("#log").html(), "0,keydown,", "Keydown HOME");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
+ equals( $("#log").html(), "27,keydown,", "Keydown END");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
- equals( $("#log").html(), "1,keydown,", "Keydown ESCAPE (close submenu)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
+ equals( $("#log").html(), "0,keydown,", "Keydown HOME");
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
+ equals( $("#log").html(), "1,keydown,", "Keydown ESCAPE (close submenu)");
- setTimeout( function() {
- equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+ setTimeout( menukeyboard4, 50 );
+ }
- menu_log("keydown",true);
- element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
- equals( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER (select item)");
+ function menukeyboard4() {
+ equals( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
- start();
- }, 200);
- }, 150);
- }, 100);
+ menu_log("keydown",true);
+ element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+ equals( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER (select item)");
+ start();
+ }
});
})(jQuery);
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index 0ecaf7328..3bcab3361 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -5,6 +5,36 @@
module("menu: methods");
+test( "enable/disable", function() {
+ expect( 3 );
+ var menu = $( "#menu1" ).menu({
+ select: function(event, ui) {
+ menu_log();
+ }
+ });
+ menu.menu("disable");
+ ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
+ menu_log("click",true);
+ menu_click(menu,"1");
+ menu_log("afterclick");
+ menu.menu("enable");
+ ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
+ menu_log("click");
+ menu_click(menu,"1");
+ menu_log("afterclick");
+ equals( $("#log").html(), "afterclick,1,click,afterclick,click,", "Click order not valid.");
+});
+
+test( "refresh", function() {
+ expect( 3 );
+ var menu = $( "#menu1" ).menu();
+ equals(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
+ menu.append("<li><a href='#'>test item</a></li>").menu("refresh");
+ equals(menu.find(".ui-menu-item").length,6,"Incorrect number of menu items");
+ menu.find(".ui-menu-item:last").remove().end().menu("refresh");
+ equals(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
+});
+
test("destroy", function() {
domEqual("#menu1", function() {
$("#menu1").menu().menu("destroy");
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 03822fd74..479aab0d1 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -5,6 +5,34 @@
module("menu: options");
+test( "{ disabled: true }", function() {
+ expect( 2 );
+ var menu = $( "#menu1" ).menu({
+ disabled: true,
+ select: function(event, ui) {
+ menu_log();
+ }
+ });
+ ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
+ menu_log("click",true);
+ menu_click(menu,"1");
+ menu_log("afterclick");
+ equals( $("#log").html(), "afterclick,click,", "Click order not valid.");
+});
+test( "{ disabled: false }", function() {
+ expect( 2 );
+ var menu = $( "#menu1" ).menu({
+ disabled: false,
+ select: function(event, ui) {
+ menu_log();
+ }
+ });
+ ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
+ menu_log("click",true);
+ menu_click(menu,"1");
+ menu_log("afterclick");
+ equals( $("#log").html(), "afterclick,1,click,", "Click order not valid.");
+});
})(jQuery);
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 1323c774a..d0d13fa84 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -281,7 +281,7 @@ test( "enable", function() {
var element = $( "#tabs1" ).tabs({
disabled: [ 0, 1 ],
- enable: function ( event, ui ) {
+ enable: function( event, ui ) {
equals( ui.tab, element.find( ".ui-tabs-nav a" )[ 1 ], "ui.tab" );
equals( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" );
equals( ui.index, 1, "ui.index" );
@@ -296,10 +296,10 @@ test( "disable", function() {
expect( 3 );
var element = $( "#tabs1" ).tabs({
- disable: function ( event, ui ) {
- equals( ui.tab, element.find( ".ui-tabs-nav a" )[ 1 ], "ui.tab" );
- equals( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" );
- equals( ui.index, 1, "ui.index" );
+ disable: function( event, ui ) {
+ equals( ui.tab, element.find( ".ui-tabs-nav a" )[ 1 ], "ui.tab" );
+ equals( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" );
+ equals( ui.index, 1, "ui.index" );
}
});
element.tabs( "disable", 1 );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index df83abe91..86fa658aa 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -1050,11 +1050,54 @@ test( "redefine", function() {
}
});
- var instance = new $.ui.testWidget();
+ var instance = new $.ui.testWidget({});
instance.method( "foo" );
equal( $.ui.testWidget.foo, "bar", "static properties remain" );
});
+test( "redefine deep prototype chain", function() {
+ expect( 8 );
+ $.widget( "ui.testWidget", {
+ method: function( str ) {
+ strictEqual( this, instance, "original invoked with correct this" );
+ equal( str, "level 4", "original invoked with correct parameter" );
+ }
+ });
+ $.widget( "ui.testWidget2", $.ui.testWidget, {
+ method: function( str ) {
+ strictEqual( this, instance, "testWidget2 invoked with correct this" );
+ equal( str, "level 2", "testWidget2 invoked with correct parameter" );
+ this._super( "level 3" );
+ }
+ });
+ $.widget( "ui.testWidget3", $.ui.testWidget2, {
+ method: function( str ) {
+ strictEqual( this, instance, "testWidget3 invoked with correct this" );
+ equal( str, "level 1", "testWidget3 invoked with correct parameter" );
+ this._super( "level 2" );
+ }
+ });
+ // redefine testWidget after other widgets have inherited from it
+ // this tests whether the inheriting widgets get updated prototype chains
+ $.widget( "ui.testWidget", $.ui.testWidget, {
+ method: function( str ) {
+ strictEqual( this, instance, "new invoked with correct this" );
+ equal( str, "level 3", "new invoked with correct parameter" );
+ this._super( "level 4" );
+ }
+ });
+ // redefine testWidget3 after it has been automatically redefined
+ // this tests whether we properly handle _super() when the topmost prototype
+ // doesn't have the method defined
+ $.widget( "ui.testWidget3", $.ui.testWidget3, {} );
+
+ var instance = new $.ui.testWidget3({});
+ instance.method( "level 1" );
+
+ delete $.ui.testWidget3;
+ delete $.ui.testWidget2;
+});
+
asyncTest( "_delay", function() {
expect( 6 );
var order = 0,