Skip to content

Commit d599bf9

Browse files
fnagelfnagel
committed
Selectmenu tests: CGL, trim triling spaces
1 parent f434271 commit d599bf9

File tree

4 files changed

+215
-215
lines changed

4 files changed

+215
-215
lines changed

‎tests/unit/selectmenu/selectmenu_core.js‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@ module( "selectmenu: core" );
44

55
test("accessibility", function () {
66
var links,
7-
element = $("#speed").selectmenu(),
8-
button = element.selectmenu("widget"),
9-
menu = element.selectmenu("menuWidget");
7+
element = $( "#speed" ).selectmenu(),
8+
button = element.selectmenu( "widget" ),
9+
menu = element.selectmenu( "menuWidget" );
1010

1111
button.simulate( "focus" );
12-
links = menu.find("li.ui-menu-item a");
12+
links = menu.find( "li.ui-menu-item a" );
1313

1414
expect(13 + links.length * 2);
1515

16-
equal( button.attr("role"), "combobox", "button link role" );
17-
equal( button.attr("aria-haspopup"), "true", "button link aria-haspopup" );
18-
equal( button.attr("aria-expanded"), "false", "button link aria-expanded" );
19-
equal( button.attr("aria-autocomplete"), "list", "button link aria-autocomplete" );
20-
equal( button.attr("aria-owns"), menu.attr("id"), "button link aria-owns" );
21-
equal( button.attr("aria-labelledby"), links.eq( element[0].selectedIndex ).attr( "id" ), "button link aria-labelledby" );
22-
equal( button.attr("tabindex"), 0, "button link tabindex" );
23-
24-
equal( menu.attr("role"), "listbox", "menu role" );
25-
equal( menu.attr("aria-labelledby"), button.attr("id"), "menu aria-labelledby" );
26-
equal( menu.attr("aria-hidden"), "true", "menu aria-hidden" );
27-
equal( menu.attr("tabindex"), 0, "menu tabindex" );
28-
equal( menu.attr("aria-activedescendant"), links.eq(element[0].selectedIndex).attr("id"), "menu aria-activedescendant" );
29-
$.each( links, function(index){
30-
equal( $(this).attr("role"), "option", "menu link #" + index +" role" );
31-
equal( $(this).attr("tabindex"), -1, "menu link #" + index +" tabindex" );
16+
equal( button.attr( "role" ), "combobox", "button link role" );
17+
equal( button.attr( "aria-haspopup" ), "true", "button link aria-haspopup" );
18+
equal( button.attr( "aria-expanded" ), "false", "button link aria-expanded" );
19+
equal( button.attr( "aria-autocomplete" ), "list", "button link aria-autocomplete" );
20+
equal( button.attr( "aria-owns" ), menu.attr("id"), "button link aria-owns" );
21+
equal( button.attr( "aria-labelledby" ), links.eq( element[0].selectedIndex ).attr( "id" ), "button link aria-labelledby" );
22+
equal( button.attr( "tabindex" ), 0, "button link tabindex" );
23+
24+
equal( menu.attr( "role" ), "listbox", "menu role" );
25+
equal( menu.attr( "aria-labelledby" ), button.attr( "id" ), "menu aria-labelledby" );
26+
equal( menu.attr( "aria-hidden" ), "true", "menu aria-hidden" );
27+
equal( menu.attr( "tabindex" ), 0, "menu tabindex" );
28+
equal( menu.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "menu aria-activedescendant" );
29+
$.each( links, function( index ){
30+
equal( $( this ).attr( "role" ), "option", "menu link #" + index +" role" );
31+
equal( $( this ).attr( "tabindex" ), -1, "menu link #" + index +" tabindex" );
3232
});
33-
equal( links.eq(element[0].selectedIndex).attr("aria-selected"), "true", "selected menu link aria-selected" );
33+
equal( links.eq( element[ 0 ].selectedIndex ).attr( "aria-selected" ), "true", "selected menu link aria-selected" );
3434
});
3535

3636

@@ -44,75 +44,75 @@ $.each([
4444
selector: "#files"
4545
}
4646
], function( i, settings ) {
47-
test("state synchronization - after keydown on button - " + settings.type, function () {
48-
expect(5);
47+
test( "state synchronization - after keydown on button - " + settings.type, function () {
48+
expect( 5 );
4949

5050
var links,
51-
element = $(settings.selector).selectmenu(),
52-
button = element.selectmenu("widget"),
53-
menu = element.selectmenu("menuWidget"),
54-
selected = element.find("option:selected");
51+
element = $( settings.selector ).selectmenu(),
52+
button = element.selectmenu( "widget" ),
53+
menu = element.selectmenu( "menuWidget" ),
54+
selected = element.find( "option:selected" );
5555

5656
button.simulate( "focus" );
5757
links = menu.find("li.ui-menu-item a");
5858

5959
button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
60-
equal( menu.attr("aria-activedescendant"), links.eq(element[0].selectedIndex).attr("id"), "menu aria-activedescendant" );
61-
equal( links.eq(element[0].selectedIndex).attr("aria-selected"), "true", "selected menu link aria-selected" );
62-
equal( button.attr("aria-activedescendant"), links.eq(element[0].selectedIndex).attr("id"), "button aria-activedescendant" );
63-
equal( element.find("option:selected").val(), selected.next("option").val() , "original select state" );
64-
equal( button.text(), selected.next("option").text(), "button text" );
60+
equal( menu.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "menu aria-activedescendant" );
61+
equal( links.eq( element[ 0 ].selectedIndex ).attr( "aria-selected" ), "true", "selected menu link aria-selected" );
62+
equal( button.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "button aria-activedescendant" );
63+
equal( element.find( "option:selected" ).val(), selected.next( "option" ).val() , "original select state" );
64+
equal( button.text(), selected.next( "option" ).text(), "button text" );
6565
});
6666

6767
test("state synchronization - after click on item - " + settings.type, function () {
6868
expect(5);
6969

7070
var links,
71-
element = $(settings.selector).selectmenu(),
72-
button = element.selectmenu("widget"),
73-
menu = element.selectmenu("menuWidget");
71+
element = $( settings.selector ).selectmenu(),
72+
button = element.selectmenu( "widget" ),
73+
menu = element.selectmenu( "menuWidget" );
7474

7575
button.simulate( "focus" );
7676
links = menu.find("li.ui-menu-item a");
7777

7878
button.simulate( "click" );
79-
menu.find("a").last().simulate( "mouseover" ).trigger( "click" );
80-
equal( menu.attr("aria-activedescendant"), links.eq(element[0].selectedIndex).attr("id"), "menu aria-activedescendant" );
81-
equal( links.eq(element[0].selectedIndex).attr("aria-selected"), "true", "selected menu link aria-selected" );
82-
equal( button.attr("aria-activedescendant"), links.eq(element[0].selectedIndex).attr("id"), "button aria-activedescendant" );
83-
equal( element.find("option:selected").val(), element.find("option").last().val(), "original select state" );
84-
equal( button.text(), element.find("option").last().text(), "button text" );
79+
menu.find( "a" ).last().simulate( "mouseover" ).trigger( "click" );
80+
equal( menu.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "menu aria-activedescendant" );
81+
equal( links.eq( element[ 0 ].selectedIndex ).attr( "aria-selected" ), "true", "selected menu link aria-selected" );
82+
equal( button.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "button aria-activedescendant" );
83+
equal( element.find( "option:selected" ).val(), element.find( "option" ).last().val(), "original select state" );
84+
equal( button.text(), element.find( "option" ).last().text(), "button text" );
8585
});
86-
87-
test("state synchronization - after focus item and keydown on button - " + settings.type, function () {
86+
87+
test( "state synchronization - after focus item and keydown on button - " + settings.type, function () {
8888
expect(5);
8989

9090
var links,
91-
element = $(settings.selector).selectmenu(),
92-
button = element.selectmenu("widget"),
93-
menu = element.selectmenu("menuWidget"),
94-
selected = element.find("option:selected"),
95-
options = element.find("option");
91+
element = $( settings.selector ).selectmenu(),
92+
button = element.selectmenu( "widget" ),
93+
menu = element.selectmenu( "menuWidget" ),
94+
selected = element.find( "option:selected" ),
95+
options = element.find( "option" );
9696

9797
// init menu
98-
button.simulate( "focus" );
99-
links = menu.find("li.ui-menu-item a");
98+
button.simulate( "focus" );
99+
links = menu.find( "li.ui-menu-item a" );
100100
// open menu and click first item
101-
button.simulate( "click" );
101+
button.simulate( "click" );
102102
links.first().simulate( "mouseover" ).trigger( "click" );
103103
// open menu again and hover item
104-
button.simulate( "click" );
104+
button.simulate( "click" );
105105
links.eq(3).simulate( "mouseover" );
106106
// close and use keyboard control on button
107107
button.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
108108
button.simulate( "focus" );
109109
button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
110-
111-
equal( menu.attr("aria-activedescendant"), links.eq(1).attr("id"), "menu aria-activedescendant" );
112-
equal( links.eq(1).attr("aria-selected"), "true", "selected menu link aria-selected" );
113-
equal( button.attr("aria-activedescendant"), links.eq(1).attr("id"), "button aria-activedescendant" );
114-
equal( element.find("option:selected").val(), options.eq(1).val() , "original select state" );
115-
equal( button.text(), options.eq(1).text(), "button text" );
110+
111+
equal( menu.attr( "aria-activedescendant" ), links.eq( 1 ).attr( "id" ), "menu aria-activedescendant" );
112+
equal( links.eq( 1 ).attr("aria-selected" ), "true", "selected menu link aria-selected" );
113+
equal( button.attr( "aria-activedescendant" ), links.eq( 1 ).attr( "id" ), "button aria-activedescendant" );
114+
equal( element.find( "option:selected" ).val(), options.eq( 1 ).val() , "original select state" );
115+
equal( button.text(), options.eq( 1 ).text(), "button text" );
116116
});
117117
});
118118

‎tests/unit/selectmenu/selectmenu_events.js‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
11
(function ($) {
22

3-
module("selectmenu: events", {
3+
module( "selectmenu: events", {
44
setup: function () {
5-
this.element = $("#speed");
5+
this.element = $( "#speed" );
66
}
77
});
88

9-
test("change", function () {
10-
expect(5);
9+
test( "change", function () {
10+
expect( 5 );
1111

1212
this.element.selectmenu({
13-
change: function (event, ui) {
14-
ok(event, "change event fired on change");
15-
equal(event.type, "selectmenuchange", "event type set to selectmenuchange");
16-
ok(ui, "ui object is passed as second argument to event handler");
17-
equal(ui.item.element[0].nodeName, "OPTION", "ui.item.element[0] points to original option element");
18-
equal(ui.item.value, value, "ui.item.value property updated correctly");
13+
change: function ( event, ui ) {
14+
ok( event, "change event fired on change" );
15+
equal( event.type, "selectmenuchange", "event type set to selectmenuchange" );
16+
ok(ui, "ui object is passed as second argument to event handler" );
17+
equal( ui.item.element[ 0 ].nodeName, "OPTION", "ui.item.element[0] points to original option element" );
18+
equal( ui.item.value, value, "ui.item.value property updated correctly" );
1919
}
2020
});
2121

22-
var button = this.element.selectmenu("widget").parent(),
23-
menu = this.element.selectmenu("menuWidget").parent(),
24-
value = this.element.find("option").first().text();
22+
var button = this.element.selectmenu( "widget" ).parent(),
23+
menu = this.element.selectmenu( "menuWidget" ).parent(),
24+
value = this.element.find( "option" ).first().text();
2525

26-
button.find("a").simulate( "focus" ).simulate( "click" );
27-
menu.find("a").first().simulate( "mouseover" ).trigger( "click" );
26+
button.find( "a" ).simulate( "focus" ).simulate( "click" );
27+
menu.find( "a" ).first().simulate( "mouseover" ).trigger( "click" );
2828
});
2929

3030

31-
test("close", function () {
32-
expect(3);
31+
test( "close", function () {
32+
expect( 3 );
3333

3434
this.element.selectmenu({
35-
close: function (event, ui) {
36-
ok(event, "close event fired on close");
37-
equal(event.type, "selectmenuclose", "event type set to selectmenuclose");
38-
ok(ui, "ui object is passed as second argument to event handler");
35+
close: function ( event, ui ) {
36+
ok( event, "close event fired on close" );
37+
equal( event.type, "selectmenuclose", "event type set to selectmenuclose" );
38+
ok( ui, "ui object is passed as second argument to event handler" );
3939
}
4040
});
4141

42-
this.element.selectmenu("open").selectmenu("close");
42+
this.element.selectmenu( "open" ).selectmenu( "close" );
4343
});
4444

4545

46-
test("focus", function () {
47-
expect(4);
46+
test( "focus", function () {
47+
expect( 4 );
4848

4949
var button,
5050
menu,
5151
links;
5252

5353
this.element.selectmenu({
54-
focus: function (event, ui) {
55-
ok(event, "focus event fired on mouseover");
56-
equal(event.type, "selectmenufocus", "event type set to selectmenufocus");
57-
ok(ui, "ui object is passed as second argument to event handler");
58-
equal(ui.item.element[0].nodeName, "OPTION", "ui points to original option element");
54+
focus: function ( event, ui ) {
55+
ok( event, "focus event fired on mouseover" );
56+
equal( event.type, "selectmenufocus", "event type set to selectmenufocus" );
57+
ok( ui, "ui object is passed as second argument to event handler" );
58+
equal( ui.item.element[0].nodeName, "OPTION", "ui points to original option element" );
5959
}
6060
});
61-
62-
button = this.element.selectmenu("widget"),
63-
menu = this.element.selectmenu("menuWidget");
61+
62+
button = this.element.selectmenu( "widget" ),
63+
menu = this.element.selectmenu( "menuWidget" );
6464

6565
button.simulate( "focus" );
66-
links = menu.find("li.ui-menu-item a");
67-
66+
links = menu.find( "li.ui-menu-item a" );
67+
6868
button.simulate( "click" );
69-
70-
menu.find("a").last().simulate( "mouseover" );
71-
72-
this.element.selectmenu("close");
69+
70+
menu.find( "a" ).last().simulate( "mouseover" );
71+
72+
this.element.selectmenu( "close" );
7373
});
7474

7575

76-
test("open", function () {
77-
expect(3);
76+
test( "open", function () {
77+
expect( 3 );
7878

7979
this.element.selectmenu({
80-
open: function (event, ui) {
81-
ok(event, "open event fired on open");
82-
equal(event.type, "selectmenuopen", "event type set to selectmenuopen");
83-
ok(ui, "ui object is passed as second argument to event handler");
80+
open: function ( event, ui ) {
81+
ok( event, "open event fired on open" );
82+
equal( event.type, "selectmenuopen", "event type set to selectmenuopen" );
83+
ok( ui, "ui object is passed as second argument to event handler" );
8484
}
8585
});
8686

87-
this.element.selectmenu("open");
87+
this.element.selectmenu( "open" );
8888
});
8989

9090

91-
test("select", function () {
92-
expect(4);
91+
test( "select", function () {
92+
expect( 4 );
9393

9494
this.element.selectmenu({
95-
select: function (event, ui) {
96-
ok(event, "select event fired on item select");
97-
equal(event.type, "selectmenuselect", "event type set to selectmenuselect");
98-
ok(ui, "ui object is passed as second argument to event handler");
99-
equal(ui.item.element[0].nodeName, "OPTION", "ui points to original option element");
95+
select: function ( event, ui ) {
96+
ok( event, "select event fired on item select" );
97+
equal( event.type, "selectmenuselect", "event type set to selectmenuselect" );
98+
ok( ui, "ui object is passed as second argument to event handler" );
99+
equal( ui.item.element[0].nodeName, "OPTION", "ui points to original option element" );
100100
}
101101
});
102102

103-
var button = this.element.selectmenu("widget").parent(),
104-
menu = this.element.selectmenu("menuWidget").parent();
103+
var button = this.element.selectmenu( "widget" ).parent(),
104+
menu = this.element.selectmenu( "menuWidget" ).parent();
105105

106-
button.find("a").simulate( "focus" ).simulate( "click" );
107-
menu.find("a").first().simulate( "mouseover" ).trigger("click");
106+
button.find( "a" ).simulate( "focus" ).simulate( "click" );
107+
menu.find( "a" ).first().simulate( "mouseover" ).trigger( "click" );
108108
});
109109

110110
})(jQuery);

0 commit comments

Comments
 (0)