Skip to content

Commit bdb0f7a

Browse files
scottgonzalezscottgonzalez
committed
Selectmenu: Test cleanup
1 parent 56f6f92 commit bdb0f7a

File tree

2 files changed

+47
-49
lines changed

2 files changed

+47
-49
lines changed

‎tests/unit/selectmenu/selectmenu_events.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ asyncTest( "change", function() {
3535
});
3636
});
3737

38-
3938
test( "close", function() {
4039
expect( 2 );
4140

@@ -48,7 +47,7 @@ test( "close", function() {
4847
});
4948

5049
shouldFire = false;
51-
this.element.selectmenu( "open" )
50+
this.element.selectmenu( "open" );
5251
shouldFire = true;
5352
this.element.selectmenu( "close" );
5453
shouldFire = false;
@@ -57,7 +56,6 @@ test( "close", function() {
5756
$( "body" ).trigger( "mousedown" );
5857
});
5958

60-
6159
asyncTest( "focus", function() {
6260
expect( 9 );
6361

@@ -95,7 +93,6 @@ asyncTest( "focus", function() {
9593
});
9694
});
9795

98-
9996
test( "open", function() {
10097
expect( 1 );
10198

@@ -108,7 +105,6 @@ test( "open", function() {
108105
this.element.selectmenu( "open" );
109106
});
110107

111-
112108
asyncTest( "select", function() {
113109
expect( 3 );
114110

‎tests/unit/selectmenu/selectmenu_methods.js‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ test( "destroy", function() {
99
});
1010
});
1111

12-
1312
test( "open / close", function() {
14-
expect( 4 );
13+
expect( 5 );
1514

1615
var element = $( "#speed" ).selectmenu(),
1716
menu = element.selectmenu( "menuWidget" );
1817

18+
ok( menu.is( ":hidden" ), "menu hidden on init" );
19+
1920
element.selectmenu( "open" );
2021
ok( menu.is( ":visible" ), "open: menu visible" );
2122
equal( menu.attr( "aria-hidden" ), "false", "open: menu aria-disabled" );
@@ -25,9 +26,8 @@ test( "open / close", function() {
2526
equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
2627
});
2728

28-
29-
test( "enable / disable", function () {
30-
expect(10);
29+
test( "enable / disable", function() {
30+
expect( 10 );
3131

3232
var element = $( "#speed" ).selectmenu(),
3333
button = element.selectmenu( "widget" ),
@@ -36,39 +36,43 @@ test( "enable / disable", function () {
3636
element.selectmenu( "disable" );
3737
ok( element.selectmenu( "option", "disabled" ), "disable: widget option" );
3838
equal( element.attr( "disabled" ), "disabled", "disable: native select disabled" );
39-
equal( button.attr( "aria-disabled" ), "true", "disable: button wrapper ARIA" );
39+
equal( button.attr( "aria-disabled" ), "true", "disable: button ARIA" );
4040
equal( button.attr( "tabindex" ), -1, "disable: button tabindex" );
41-
equal( menu.attr( "aria-disabled" ), "true", "disable: menu wrapper ARIA" );
41+
equal( menu.attr( "aria-disabled" ), "true", "disable: menu ARIA" );
4242

4343
element.selectmenu( "enable" );
4444
ok( !element.selectmenu( "option", "disabled" ), "enable: widget option" );
4545
equal( element.attr( "disabled" ), undefined, "enable: native select disabled" );
46-
equal( button.attr( "aria-disabled" ), "false", "enable: button wrapper ARIA" );
46+
equal( button.attr( "aria-disabled" ), "false", "enable: button ARIA" );
4747
equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
48-
equal( menu.attr( "aria-disabled" ), "false", "enable: menu wrapper ARIA" );
48+
equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
4949
});
5050

51-
52-
test( "refresh - structure", function () {
51+
test( "refresh - structure", function() {
5352
expect( 3 );
5453

55-
var element = $( "#speed" ).selectmenu(),
56-
menu = element.selectmenu( "menuWidget" ).parent();
54+
var menuItems,
55+
element = $( "#speed" ).selectmenu(),
56+
menu = element.selectmenu( "menuWidget" ),
57+
options = element.find( "option" );
5758

58-
element.find( "option" ).eq( 2 ).remove();
59-
element.find( "option" ).eq( 3 ).remove();
60-
element.append( "<option value=\"added_option\">Added option</option>" );
61-
element.find( "option" ).first()
59+
options.eq( 0 )
6260
.attr( "value", "changed_value" )
6361
.text( "Changed value" );
62+
options.eq( 2 ).remove();
63+
options.eq( 3 ).remove();
64+
element.append( "<option value=\"added_option\">Added option</option>" );
6465
element.selectmenu( "refresh" );
6566

66-
equal( element.find( "option" ).length, menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).length, "menu item length" );
67-
equal( element.find( "option" ).last().text(), menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).last().text(), "added item" );
68-
equal( element.find( "option" ).first().text(), menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).first().text(), "changed item" );
67+
options = element.find( "option" );
68+
menuItems = menu.find( "li" ).not( ".ui-selectmenu-optgroup" );
69+
70+
equal( options.length, menuItems.length, "menu item length" );
71+
equal( "Added option", menuItems.last().text(), "added item" );
72+
equal( "Changed value", menuItems.eq( 0 ).text(), "changed item" );
6973
});
7074

71-
asyncTest( "refresh - change selected option", function () {
75+
asyncTest( "refresh - change selected option", function() {
7276
expect( 4 );
7377

7478
var element = $( "#speed" ).selectmenu(),
@@ -77,59 +81,54 @@ asyncTest( "refresh - change selected option", function () {
7781
equal( element.find( "option:selected" ).text(), button.text(), "button text after init" );
7882

7983
button.simulate( "focus" );
80-
8184
setTimeout(function() {
8285
equal( element.find( "option:selected" ).text(), button.text(), "button text after focus" );
8386

8487
element[ 0 ].selectedIndex = 0;
8588
element.selectmenu( "refresh" );
86-
equal( element.find( "option:selected" ).text(), button.text(), "button text after changing selected option" );
89+
equal( element.find( "option:selected" ).text(), button.text(),
90+
"button text after changing selected option" );
8791

88-
element.find( "option" ).removeAttr( "selected" );
92+
element.find( "option" ).prop( "selected", false );
8993
element.prepend( "<option selected value=\"selected_option\">Selected option</option>" );
9094
element.selectmenu( "refresh" );
91-
equal( element.find( "option:selected" ).text(), button.text(), "button text after adding selected option" );
95+
equal( "Selected option", button.text(), "button text after adding selected option" );
9296

9397
start();
94-
}, 1 );
98+
});
9599
});
96100

97-
98-
test( "refresh - disabled select", function () {
101+
test( "refresh - disabled select", function() {
99102
expect( 4 );
100103

101104
var element = $( "#speed" ).selectmenu(),
102105
button = element.selectmenu( "widget" ),
103106
menu = element.selectmenu( "menuWidget" );
104107

105-
element.attr( "disabled", "disabled" );
108+
element.prop( "disabled", true );
106109
element.selectmenu( "refresh" );
107110

108111
ok( element.selectmenu( "option", "disabled" ), "widget option" );
109-
equal( button.attr( "aria-disabled" ), "true", "button wrapper ARIA" );
112+
equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
110113
equal( button.attr( "tabindex" ), -1, "button tabindex" );
111-
equal( menu.attr( "aria-disabled" ), "true", "menu wrapper ARIA" );
114+
equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
112115
});
113116

114-
115-
test( "refresh - disabled option", function () {
116-
expect(1);
117+
test( "refresh - disabled option", function() {
118+
expect( 1 );
117119

118120
var disabledItem,
119121
element = $( "#speed" ).selectmenu(),
120122
menu = element.selectmenu( "menuWidget" ).parent();
121123

122-
element.attr( "disabled", "disabled" );
123-
element.find( "option" ).eq( 2 ).attr( "disabled", "disabled" );
124+
element.find( "option" ).eq( 2 ).prop( "disabled", true );
124125
element.selectmenu( "refresh" );
125126

126-
disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq(2);
127+
disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq( 2 );
127128
ok( disabledItem.hasClass( "ui-state-disabled" ), "class" );
128129
});
129130

130-
131-
test( "refresh - disabled optgroup", function () {
132-
131+
test( "refresh - disabled optgroup", function() {
133132
var i, item,
134133
element = $( "#files" ).selectmenu(),
135134
menu = element.selectmenu( "menuWidget" ).parent(),
@@ -138,13 +137,17 @@ test( "refresh - disabled optgroup", function () {
138137

139138
expect( 2 + originalDisabledOptions.length );
140139

141-
originalDisabledOptgroup.attr( "disabled", "disabled" );
140+
originalDisabledOptgroup.prop( "disabled", true );
142141
element.selectmenu( "refresh" );
143142

144143
item = menu.find( "li.ui-selectmenu-optgroup" ).first();
145144
ok( item.hasClass( "ui-state-disabled" ), "class" );
146145

147-
equal( menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length, originalDisabledOptions.length, "disabled options" );
146+
equal(
147+
menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length,
148+
originalDisabledOptions.length,
149+
"disabled options"
150+
);
148151
for ( i = 0; i < originalDisabledOptions.length; i++ ) {
149152
item = item.next( "li" );
150153
ok( item.hasClass( "ui-state-disabled" ), "item #" + i + ": class" );
@@ -153,12 +156,11 @@ test( "refresh - disabled optgroup", function () {
153156

154157
test( "widget and menuWidget", function() {
155158
expect( 4 );
159+
156160
var element = $( "#speed" ).selectmenu(),
157161
button = element.selectmenu( "widget" ),
158162
menu = element.selectmenu( "menuWidget" );
159163

160-
element.selectmenu( "refresh" );
161-
162164
equal( button.length, 1, "button: one element" );
163165
ok( button.is( ".ui-selectmenu-button" ), "button: class" );
164166

0 commit comments

Comments
 (0)