Skip to content

Commit 9b6c1c5

Browse files
scottgonzalezscottgonzalez
committed
Menu tests: Cleanup.
1 parent 90050c7 commit 9b6c1c5

File tree

4 files changed

+71
-71
lines changed

4 files changed

+71
-71
lines changed

‎tests/unit/menu/menu_core.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ module( "menu: core" );
55
test( "accessibility", function () {
66
expect( 5 );
77
var item,
8-
menu = $( "#menu1" ).menu(),
8+
element = $( "#menu1" ).menu(),
99
item0 = $( "li:eq(0) a" );
1010

11-
ok( menu.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
12-
equal( menu.attr( "role" ), "menu", "main role" );
13-
ok( !menu.attr( "aria-activedescendant" ), "aria attribute not yet active" );
11+
ok( element.hasClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ), "menu class");
12+
equal( element.attr( "role" ), "menu", "main role" );
13+
ok( !element.attr( "aria-activedescendant" ), "aria attribute not yet active" );
1414

15-
item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
16-
menu.menu( "focus", $.Event(), item );
17-
equal( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from DOM" );
15+
item = element.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
16+
element.menu( "focus", $.Event(), item );
17+
equal( element.attr( "aria-activedescendant" ), "xid", "aria attribute, id from DOM" );
1818

19-
item = menu.find( "li:last" );
20-
menu.menu( "focus", $.Event(), item );
21-
ok( /^ui-id-\d+$/.test( menu.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
19+
item = element.find( "li:last" );
20+
element.menu( "focus", $.Event(), item );
21+
ok( /^ui-id-\d+$/.test( element.attr( "aria-activedescendant" ) ), "aria attribute, generated id");
2222
});
2323

2424
})( jQuery );

‎tests/unit/menu/menu_events.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ module( "menu: events", {
1212

1313
test( "handle click on menu", function() {
1414
expect( 1 );
15-
var menu = $( "#menu1" ).menu({
15+
var element = $( "#menu1" ).menu({
1616
select: function( event, ui ) {
1717
log();
1818
}
1919
});
2020
log( "click", true );
2121
click( $( "#menu1" ), "1" );
2222
log( "afterclick" );
23-
click( menu, "2" );
23+
click( element, "2" );
2424
click( $( "#menu1" ), "3" );
25-
click( menu, "1" );
25+
click( element, "1" );
2626
equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
2727
});
2828

2929
test( "handle click on custom item menu", function() {
3030
expect( 1 );
31-
var menu = $( "#menu5" ).menu({
31+
var element = $( "#menu5" ).menu({
3232
select: function( event, ui ) {
3333
log();
3434
},
@@ -37,16 +37,16 @@ test( "handle click on custom item menu", function() {
3737
log( "click", true );
3838
click( $( "#menu5" ), "1" );
3939
log( "afterclick" );
40-
click( menu, "2" );
40+
click( element, "2" );
4141
click( $( "#menu5" ), "3" );
42-
click( menu, "1" );
42+
click( element, "1" );
4343
equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
4444
});
4545

4646
asyncTest( "handle blur", function() {
4747
expect( 1 );
4848
var blurHandled = false,
49-
menu = $( "#menu1" ).menu({
49+
element = $( "#menu1" ).menu({
5050
blur: function( event, ui ) {
5151
// Ignore duplicate blur event fired by IE
5252
if ( !blurHandled ) {
@@ -56,17 +56,17 @@ asyncTest( "handle blur", function() {
5656
}
5757
});
5858

59-
click( menu, "1" );
59+
click( element, "1" );
6060
setTimeout( function() {
61-
menu.blur();
61+
element.blur();
6262
start();
6363
}, 350 );
6464
});
6565

6666
asyncTest( "handle blur on click", function() {
6767
expect( 1 );
6868
var blurHandled = false,
69-
menu = $( "#menu1" ).menu({
69+
element = $( "#menu1" ).menu({
7070
blur: function( event, ui ) {
7171
// Ignore duplicate blur event fired by IE
7272
if ( !blurHandled ) {
@@ -76,7 +76,7 @@ asyncTest( "handle blur on click", function() {
7676
}
7777
});
7878

79-
click( menu, "1" );
79+
click( element, "1" );
8080
setTimeout( function() {
8181
$( "<a>", { id: "remove"} ).appendTo( "body" ).trigger( "click" );
8282
start();
@@ -101,59 +101,59 @@ test( "handle focus of menu with active item", function() {
101101

102102
asyncTest( "handle submenu auto collapse: mouseleave", function() {
103103
expect( 4 );
104-
var menu = $( "#menu2" ).menu(),
104+
var element = $( "#menu2" ).menu(),
105105
event = $.Event( "mouseenter" );
106106

107107
function menumouseleave1() {
108-
equal( menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
109-
menu.menu( "focus", event, menu.find( "li:nth-child(7) li:first" ) );
108+
equal( element.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
109+
element.menu( "focus", event, element.find( "li:nth-child(7) li:first" ) );
110110
setTimeout( menumouseleave2, 350 );
111111
}
112112
function menumouseleave2() {
113-
equal( menu.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
114-
menu.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
113+
equal( element.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
114+
element.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
115115
setTimeout( menumouseleave3, 350 );
116116
}
117117
function menumouseleave3() {
118-
equal( menu.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
119-
menu.trigger( "mouseleave" );
118+
equal( element.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
119+
element.trigger( "mouseleave" );
120120
setTimeout( menumouseleave4, 350 );
121121
}
122122
function menumouseleave4() {
123-
equal( menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
123+
equal( element.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
124124
start();
125125
}
126126

127-
menu.find( "li:nth-child(7)" ).trigger( "mouseenter" );
127+
element.find( "li:nth-child(7)" ).trigger( "mouseenter" );
128128
setTimeout( menumouseleave1, 350 );
129129
});
130130

131131
asyncTest( "handle submenu auto collapse: mouseleave", function() {
132132
expect( 4 );
133-
var menu = $( "#menu5" ).menu({ menus: "div" }),
133+
var element = $( "#menu5" ).menu({ menus: "div" }),
134134
event = $.Event( "mouseenter" );
135135

136136
function menumouseleave1() {
137-
equal( menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
138-
menu.menu( "focus", event, menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
137+
equal( element.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
138+
element.menu( "focus", event, element.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
139139
setTimeout( menumouseleave2, 350 );
140140
}
141141
function menumouseleave2() {
142-
equal( menu.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
143-
menu.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
142+
equal( element.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
143+
element.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
144144
setTimeout( menumouseleave3, 350 );
145145
}
146146
function menumouseleave3() {
147-
equal( menu.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
148-
menu.trigger( "mouseleave" );
147+
equal( element.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
148+
element.trigger( "mouseleave" );
149149
setTimeout( menumouseleave4, 350 );
150150
}
151151
function menumouseleave4() {
152-
equal( menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
152+
equal( element.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
153153
start();
154154
}
155155

156-
menu.find( ":nth-child(7)" ).trigger( "mouseenter" );
156+
element.find( ":nth-child(7)" ).trigger( "mouseenter" );
157157
setTimeout( menumouseleave1, 350 );
158158
});
159159

‎tests/unit/menu/menu_methods.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,36 @@ module( "menu: methods", {
1212

1313
test( "enable/disable", function() {
1414
expect( 3 );
15-
var menu = $( "#menu1" ).menu({
15+
var element = $( "#menu1" ).menu({
1616
select: function( event, ui ) {
1717
log();
1818
}
1919
});
20-
menu.menu( "disable" );
21-
ok(menu.is( ".ui-state-disabled" ),"Missing ui-state-disabled class" );
20+
element.menu( "disable" );
21+
ok( element.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
2222
log( "click", true );
23-
click( menu, "1" );
23+
click( element, "1" );
2424
log( "afterclick" );
25-
menu.menu( "enable" );
26-
ok(menu.not( ".ui-state-disabled" ),"Has ui-state-disabled class" );
25+
element.menu( "enable" );
26+
ok( element.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
2727
log( "click" );
28-
click( menu, "1" );
28+
click( element, "1" );
2929
log( "afterclick" );
3030
equal( logOutput(), "click,afterclick,click,1,afterclick", "Click order not valid." );
3131
});
3232

3333
test( "refresh", function() {
3434
expect( 5 );
35-
var menu = $( "#menu1" ).menu();
36-
equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
37-
menu.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
38-
equal( menu.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
39-
menu.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
40-
equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
41-
menu.append( "<li>---</li>" ).menu( "refresh" );
42-
equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
43-
menu.children( ":last" ).remove().end().menu( "refresh" );
44-
equal( menu.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
35+
var element = $( "#menu1" ).menu();
36+
equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
37+
element.append( "<li><a href='#'>test item</a></li>" ).menu( "refresh" );
38+
equal( element.find( ".ui-menu-item" ).length, 6, "Incorrect number of menu items" );
39+
element.find( ".ui-menu-item:last" ).remove().end().menu( "refresh" );
40+
equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
41+
element.append( "<li>---</li>" ).menu( "refresh" );
42+
equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
43+
element.children( ":last" ).remove().end().menu( "refresh" );
44+
equal( element.find( ".ui-menu-item" ).length, 5, "Incorrect number of menu items" );
4545
});
4646

4747
test( "destroy", function() {

‎tests/unit/menu/menu_options.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,56 @@ module( "menu: options", {
1212

1313
test( "{ disabled: true }", function() {
1414
expect( 2 );
15-
var menu = $( "#menu1" ).menu({
15+
var element = $( "#menu1" ).menu({
1616
disabled: true,
1717
select: function(event, ui) {
1818
log();
1919
}
2020
});
21-
ok( menu.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
21+
ok( element.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" );
2222
log( "click", true );
23-
click( menu, "1" );
23+
click( element, "1" );
2424
log( "afterclick" );
2525
equal( logOutput(), "click,afterclick", "Click order not valid." );
2626
});
2727

2828
test( "{ disabled: false }", function() {
2929
expect( 2 );
30-
var menu = $( "#menu1" ).menu({
30+
var element = $( "#menu1" ).menu({
3131
disabled: false,
3232
select: function( event, ui ) {
3333
log();
3434
}
3535
});
36-
ok( menu.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
36+
ok( element.not( ".ui-state-disabled" ), "Has ui-state-disabled class" );
3737
log( "click", true );
38-
click( menu, "1" );
38+
click( element, "1" );
3939
log( "afterclick" );
4040
equal( logOutput(), "click,1,afterclick", "Click order not valid." );
4141
});
4242

4343
test( "{ role: 'menu' } ", function () {
44-
var menu = $( "#menu1" ).menu(),
45-
items = menu.find( "li" );
44+
var element = $( "#menu1" ).menu(),
45+
items = element.find( "li" );
4646
expect( 2 + 5 * items.length );
47-
equal( menu.attr( "role" ), "menu" );
47+
equal( element.attr( "role" ), "menu" );
4848
ok( items.length > 0, "number of menu items" );
4949
items.each(function( item ) {
5050
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" );
5151
equal( $( this ).attr( "role" ), "presentation", "menu item ("+ item + ") role" );
5252
equal( $( "a", this ).attr( "role" ), "menuitem", "menu item ("+ item + ") role" );
53-
ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ") " );
54-
equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ") " );
53+
ok( $( "a", this ).hasClass( "ui-corner-all" ), "a element class for menu item ("+ item + ")" );
54+
equal( $( "a", this ).attr( "tabindex" ), "-1", "a element tabindex for menu item ("+ item + ")" );
5555
});
5656
});
5757

5858
test( "{ role: 'listbox' } ", function () {
59-
var menu = $( "#menu1" ).menu({
59+
var element = $( "#menu1" ).menu({
6060
role: "listbox"
6161
}),
62-
items = menu.find( "li" );
63-
expect(2 + items.length);
64-
equal( menu.attr( "role" ), "listbox" );
62+
items = element.find( "li" );
63+
expect( 2 + items.length );
64+
equal( element.attr( "role" ), "listbox" );
6565
ok( items.length > 0, "number of menu items" );
6666
items.each(function( item ) {
6767
equal( $( "a", this ).attr( "role" ), "option", "menu item ("+ item + ") role" );

0 commit comments

Comments
 (0)