Selectmenu: Test cleanup

2 files changed, 47 insertions, 49 deletions

diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js
index 2f3548d10..3ab6e93bc 100644
--- a/tests/unit/selectmenu/selectmenu_events.js
+++ b/tests/unit/selectmenu/selectmenu_events.js
@@ -35,7 +35,6 @@ asyncTest( "change", function() {
 	});
 });
 
-
 test( "close", function() {
 	expect( 2 );
 
@@ -48,7 +47,7 @@ test( "close", function() {
 	});
 
 	shouldFire = false;
-	this.element.selectmenu( "open" )
+	this.element.selectmenu( "open" );
 	shouldFire = true;
 	this.element.selectmenu( "close" );
 	shouldFire = false;
@@ -57,7 +56,6 @@ test( "close", function() {
 	$( "body" ).trigger( "mousedown" );
 });
 
-
 asyncTest( "focus", function() {
 	expect( 9 );
 
@@ -95,7 +93,6 @@ asyncTest( "focus", function() {
 	});
 });
 
-
 test( "open", function() {
 	expect( 1 );
 
@@ -108,7 +105,6 @@ test( "open", function() {
 	this.element.selectmenu( "open" );
 });
 
-
 asyncTest( "select", function() {
 	expect( 3 );
 
diff --git a/tests/unit/selectmenu/selectmenu_methods.js b/tests/unit/selectmenu/selectmenu_methods.js
index f2b56e835..656707011 100644
--- a/tests/unit/selectmenu/selectmenu_methods.js
+++ b/tests/unit/selectmenu/selectmenu_methods.js
@@ -9,13 +9,14 @@ test( "destroy", function() {
 	});
 });
 
-
 test( "open / close", function() {
-	expect( 4 );
+	expect( 5 );
 
 	var element = $( "#speed" ).selectmenu(),
 		menu = element.selectmenu( "menuWidget" );
 
+	ok( menu.is( ":hidden" ), "menu hidden on init" );
+
 	element.selectmenu( "open" );
 	ok( menu.is( ":visible" ), "open: menu visible" );
 	equal( menu.attr( "aria-hidden" ), "false", "open: menu aria-disabled" );
@@ -25,9 +26,8 @@ test( "open / close", function() {
 	equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
 });
 
-
-test( "enable / disable", function () {
-	expect(10);
+test( "enable / disable", function() {
+	expect( 10 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
@@ -36,39 +36,43 @@ test( "enable / disable", function () {
 	element.selectmenu( "disable" );
 	ok( element.selectmenu( "option", "disabled" ), "disable: widget option" );
 	equal( element.attr( "disabled" ), "disabled", "disable: native select disabled" );
-	equal( button.attr( "aria-disabled" ), "true", "disable: button wrapper ARIA" );
+	equal( button.attr( "aria-disabled" ), "true", "disable: button ARIA" );
 	equal( button.attr( "tabindex" ), -1, "disable: button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "true", "disable: menu wrapper ARIA" );
+	equal( menu.attr( "aria-disabled" ), "true", "disable: menu ARIA" );
 
 	element.selectmenu( "enable" );
 	ok( !element.selectmenu( "option", "disabled" ), "enable: widget option" );
 	equal( element.attr( "disabled" ), undefined, "enable: native select disabled" );
-	equal( button.attr( "aria-disabled" ), "false", "enable: button wrapper ARIA" );
+	equal( button.attr( "aria-disabled" ), "false", "enable: button ARIA" );
 	equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "false", "enable: menu wrapper ARIA" );
+	equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
 });
 
-
-test( "refresh - structure", function () {
+test( "refresh - structure", function() {
 	expect( 3 );
 
-	var element = $( "#speed" ).selectmenu(),
-		menu = element.selectmenu( "menuWidget" ).parent();
+	var menuItems,
+		element = $( "#speed" ).selectmenu(),
+		menu = element.selectmenu( "menuWidget" ),
+		options = element.find( "option" );
 
-	element.find( "option" ).eq( 2 ).remove();
-	element.find( "option" ).eq( 3 ).remove();
-	element.append( "<option value=\"added_option\">Added option</option>" );
-	element.find( "option" ).first()
+	options.eq( 0 )
 		.attr( "value", "changed_value" )
 		.text( "Changed value" );
+	options.eq( 2 ).remove();
+	options.eq( 3 ).remove();
+	element.append( "<option value=\"added_option\">Added option</option>" );
 	element.selectmenu( "refresh" );
 
-	equal( element.find( "option" ).length, menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).length, "menu item length" );
-	equal( element.find( "option" ).last().text(), menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).last().text(), "added item" );
-	equal( element.find( "option" ).first().text(), menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).first().text(), "changed item" );
+	options = element.find( "option" );
+	menuItems = menu.find( "li" ).not( ".ui-selectmenu-optgroup" );
+
+	equal( options.length, menuItems.length, "menu item length" );
+	equal( "Added option", menuItems.last().text(), "added item" );
+	equal( "Changed value", menuItems.eq( 0 ).text(), "changed item" );
 });
 
-asyncTest( "refresh - change selected option", function () {
+asyncTest( "refresh - change selected option", function() {
 	expect( 4 );
 
 	var element = $( "#speed" ).selectmenu(),
@@ -77,59 +81,54 @@ asyncTest( "refresh - change selected option", function () {
 	equal( element.find( "option:selected" ).text(), button.text(), "button text after init" );
 
 	button.simulate( "focus" );
-
 	setTimeout(function() {
 		equal( element.find( "option:selected" ).text(), button.text(), "button text after focus" );
 
 		element[ 0 ].selectedIndex = 0;
 		element.selectmenu( "refresh" );
-		equal( element.find( "option:selected" ).text(), button.text(), "button text after changing selected option" );
+		equal( element.find( "option:selected" ).text(), button.text(),
+			"button text after changing selected option" );
 
-		element.find( "option" ).removeAttr( "selected" );
+		element.find( "option" ).prop( "selected", false );
 		element.prepend( "<option selected value=\"selected_option\">Selected option</option>" );
 		element.selectmenu( "refresh" );
-		equal( element.find( "option:selected" ).text(), button.text(), "button text after adding selected option" );
+		equal( "Selected option", button.text(), "button text after adding selected option" );
 
 		start();
-	}, 1 );
+	});
 });
 
-
-test( "refresh - disabled select", function () {
+test( "refresh - disabled select", function() {
 	expect( 4 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
 		menu = element.selectmenu( "menuWidget" );
 
-	element.attr( "disabled", "disabled" );
+	element.prop( "disabled", true );
 	element.selectmenu( "refresh" );
 
 	ok( element.selectmenu( "option", "disabled" ), "widget option" );
-	equal( button.attr( "aria-disabled" ), "true", "button wrapper ARIA" );
+	equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
 	equal( button.attr( "tabindex" ), -1, "button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "true", "menu wrapper ARIA" );
+	equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
 });
 
-
-test( "refresh - disabled option", function () {
-	expect(1);
+test( "refresh - disabled option", function() {
+	expect( 1 );
 
 	var disabledItem,
 		element = $( "#speed" ).selectmenu(),
 		menu = element.selectmenu( "menuWidget" ).parent();
 
-	element.attr( "disabled", "disabled" );
-	element.find( "option" ).eq( 2 ).attr( "disabled", "disabled" );
+	element.find( "option" ).eq( 2 ).prop( "disabled", true );
 	element.selectmenu( "refresh" );
 
-	disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq(2);
+	disabledItem = menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).eq( 2 );
 	ok( disabledItem.hasClass( "ui-state-disabled" ), "class" );
 });
 
-
-test( "refresh - disabled optgroup", function () {
-
+test( "refresh - disabled optgroup", function() {
 	var i, item,
 		element = $( "#files" ).selectmenu(),
 		menu = element.selectmenu( "menuWidget" ).parent(),
@@ -138,13 +137,17 @@ test( "refresh - disabled optgroup", function () {
 
 	expect( 2 + originalDisabledOptions.length );
 
-	originalDisabledOptgroup.attr( "disabled", "disabled" );
+	originalDisabledOptgroup.prop( "disabled", true );
 	element.selectmenu( "refresh" );
 
 	item = menu.find( "li.ui-selectmenu-optgroup" ).first();
 	ok( item.hasClass( "ui-state-disabled" ), "class" );
 
-	equal( menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length, originalDisabledOptions.length, "disabled options" );
+	equal(
+		menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length,
+		originalDisabledOptions.length,
+		"disabled options"
+	);
 	for ( i = 0; i < originalDisabledOptions.length; i++ ) {
 		item = item.next( "li" );
 		ok( item.hasClass( "ui-state-disabled" ), "item #" + i + ": class" );
@@ -153,12 +156,11 @@ test( "refresh - disabled optgroup", function () {
 
 test( "widget and menuWidget", function() {
 	expect( 4 );
+
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
 		menu = element.selectmenu( "menuWidget" );
 
-	element.selectmenu( "refresh" );
-
 	equal( button.length, 1, "button: one element" );
 	ok( button.is( ".ui-selectmenu-button" ), "button: class" );