Skip to content

Commit 4f15e66

Browse files
kborcherskborchers
committed
Menu: Added unit tests for the enable, disable and refresh methods as well as the disabled option. Cleaned up some variable names in unit tests.
1 parent 8c5c6e0 commit 4f15e66

File tree

4 files changed

+78
-20
lines changed

4 files changed

+78
-20
lines changed

‎tests/unit/menu/menu_core.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ module("menu: core");
99

1010
test("accessibility", function () {
1111
expect(5);
12-
var ac = $('#menu1').menu();
12+
var menu = $('#menu1').menu();
1313
var item0 = $("li:eq(0) a");
1414

15-
ok( ac.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
16-
equals( ac.attr("role"), "menu", "main role");
17-
ok( !ac.attr("aria-activedescendant"), "aria attribute not yet active");
15+
ok( menu.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
16+
equals( menu.attr("role"), "menu", "main role");
17+
ok( !menu.attr("aria-activedescendant"), "aria attribute not yet active");
1818

19-
var item = ac.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
20-
ac.menu( "focus", $.Event(), item );
21-
equals( ac.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
19+
var item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
20+
menu.menu( "focus", $.Event(), item );
21+
equals( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
2222

23-
var item = ac.find( "li:last" );
24-
ac.menu( "focus", $.Event(), item );
25-
equals( ac.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
23+
var item = menu.find( "li:last" );
24+
menu.menu( "focus", $.Event(), item );
25+
equals( menu.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
2626
});
2727

2828
test("items class and role", function () {
29-
var ac = $('#menu1').menu();
30-
expect(1 + 5 * $("li",ac).length);
31-
ok( ($("li",ac).length > 0 ), "number of menu items");
32-
$("li",ac).each(function(item) {
29+
var menu = $('#menu1').menu();
30+
expect(1 + 5 * $("li",menu).length);
31+
ok( ($("li",menu).length > 0 ), "number of menu items");
32+
$("li",menu).each(function(item) {
3333
ok( $(this).hasClass("ui-menu-item"), "menu item ("+ item + ") class for item");
3434
equals( $(this).attr("role"), "presentation", "menu item ("+ item + ") role");
3535
equals( $("a", this).attr("role"), "menuitem", "menu item ("+ item + ") role");

‎tests/unit/menu/menu_events.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ module("menu: events");
77

88
test("handle click on menu", function() {
99
expect(1);
10-
var ac = $('#menu1').menu({
10+
var menu = $('#menu1').menu({
1111
select: function(event, ui) {
1212
menu_log();
1313
}
1414
});
1515
menu_log("click",true);
1616
menu_click($('#menu1'),"1");
1717
menu_log("afterclick");
18-
menu_click( ac,"2");
18+
menu_click( menu,"2");
1919
menu_click($('#menu1'),"3");
20-
menu_click( ac,"1");
20+
menu_click( menu,"1");
2121
equals( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
2222
});
2323

2424
test("handle click on custom item menu", function() {
2525
expect(1);
26-
var ac = $('#menu5').menu({
26+
var menu = $('#menu5').menu({
2727
select: function(event, ui) {
2828
menu_log();
2929
},
@@ -32,9 +32,9 @@ test("handle click on custom item menu", function() {
3232
menu_log("click",true);
3333
menu_click($('#menu5'),"1");
3434
menu_log("afterclick");
35-
menu_click( ac,"2");
35+
menu_click( menu,"2");
3636
menu_click($('#menu5'),"3");
37-
menu_click( ac,"1");
37+
menu_click( menu,"1");
3838
equals( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
3939
});
4040

‎tests/unit/menu/menu_methods.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,36 @@
55

66
module("menu: methods");
77

8+
test( "enable/disable", function() {
9+
expect( 3 );
10+
var menu = $( "#menu1" ).menu({
11+
select: function(event, ui) {
12+
menu_log();
13+
}
14+
});
15+
menu.menu("disable");
16+
ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
17+
menu_log("click",true);
18+
menu_click(menu,"1");
19+
menu_log("afterclick");
20+
menu.menu("enable");
21+
ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
22+
menu_log("click");
23+
menu_click(menu,"1");
24+
menu_log("afterclick");
25+
equals( $("#log").html(), "afterclick,1,click,afterclick,click,", "Click order not valid.");
26+
});
27+
28+
test( "refresh", function() {
29+
expect( 3 );
30+
var menu = $( "#menu1" ).menu();
31+
equals(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
32+
menu.append("<li><a href='#'>test item</a></li>").menu("refresh");
33+
equals(menu.find(".ui-menu-item").length,6,"Incorrect number of menu items");
34+
menu.find(".ui-menu-item:last").remove().end().menu("refresh");
35+
equals(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
36+
});
37+
838
test("destroy", function() {
939
domEqual("#menu1", function() {
1040
$("#menu1").menu().menu("destroy");

‎tests/unit/menu/menu_options.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,34 @@
55

66
module("menu: options");
77

8+
test( "{ disabled: true }", function() {
9+
expect( 2 );
10+
var menu = $( "#menu1" ).menu({
11+
disabled: true,
12+
select: function(event, ui) {
13+
menu_log();
14+
}
15+
});
16+
ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
17+
menu_log("click",true);
18+
menu_click(menu,"1");
19+
menu_log("afterclick");
20+
equals( $("#log").html(), "afterclick,click,", "Click order not valid.");
21+
});
822

23+
test( "{ disabled: false }", function() {
24+
expect( 2 );
25+
var menu = $( "#menu1" ).menu({
26+
disabled: false,
27+
select: function(event, ui) {
28+
menu_log();
29+
}
30+
});
31+
ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
32+
menu_log("click",true);
33+
menu_click(menu,"1");
34+
menu_log("afterclick");
35+
equals( $("#log").html(), "afterclick,1,click,", "Click order not valid.");
36+
});
937

1038
})(jQuery);

0 commit comments

Comments
 (0)