Selectmenu: Shift to use no globals

1 files changed, 57 insertions, 55 deletions

diff --git a/tests/unit/selectmenu/methods.js b/tests/unit/selectmenu/methods.js
index e8f2d2d37..c25d01af5 100644
--- a/tests/unit/selectmenu/methods.js
+++ b/tests/unit/selectmenu/methods.js
@@ -1,58 +1,59 @@
 define( [
+	"qunit",
 	"jquery",
 	"ui/widgets/selectmenu"
-], function( $ ) {
+], function( QUnit, $ ) {
 
-module( "selectmenu: methods" );
+QUnit.module( "selectmenu: methods" );
 
-test( "destroy", function( assert ) {
-	expect( 1 );
+QUnit.test( "destroy", function( assert ) {
+	assert.expect( 1 );
 	assert.domEqual( "#speed", function() {
 		$( "#speed" ).selectmenu().selectmenu( "destroy" );
 	} );
 } );
 
-test( "open / close", function() {
-	expect( 5 );
+QUnit.test( "open / close", function( assert ) {
+	assert.expect( 5 );
 
 	var element = $( "#speed" ).selectmenu(),
 		menu = element.selectmenu( "menuWidget" );
 
-	ok( menu.is( ":hidden" ), "menu hidden on init" );
+	assert.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" );
+	assert.ok( menu.is( ":visible" ), "open: menu visible" );
+	assert.equal( menu.attr( "aria-hidden" ), "false", "open: menu aria-disabled" );
 
 	element.selectmenu( "close" );
-	ok( menu.is( ":hidden" ), "close: menu hidden" );
-	equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
+	assert.ok( menu.is( ":hidden" ), "close: menu hidden" );
+	assert.equal( menu.attr( "aria-hidden" ), "true", "close: menu aria-disabled" );
 } );
 
-test( "enable / disable", function() {
-	expect( 10 );
+QUnit.test( "enable / disable", function( assert ) {
+	assert.expect( 10 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
 		menu = element.selectmenu( "menuWidget" );
 
 	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 ARIA" );
-	equal( button.attr( "tabindex" ), -1, "disable: button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "true", "disable: menu ARIA" );
+	assert.ok( element.selectmenu( "option", "disabled" ), "disable: widget option" );
+	assert.equal( element.attr( "disabled" ), "disabled", "disable: native select disabled" );
+	assert.equal( button.attr( "aria-disabled" ), "true", "disable: button ARIA" );
+	assert.equal( button.attr( "tabindex" ), -1, "disable: button tabindex" );
+	assert.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 ARIA" );
-	equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
+	assert.ok( !element.selectmenu( "option", "disabled" ), "enable: widget option" );
+	assert.equal( element.attr( "disabled" ), undefined, "enable: native select disabled" );
+	assert.equal( button.attr( "aria-disabled" ), "false", "enable: button ARIA" );
+	assert.equal( button.attr( "tabindex" ), 0, "enable: button tabindex" );
+	assert.equal( menu.attr( "aria-disabled" ), "false", "enable: menu ARIA" );
 } );
 
-test( "refresh - structure", function() {
-	expect( 3 );
+QUnit.test( "refresh - structure", function( assert ) {
+	assert.expect( 3 );
 
 	var menuItems,
 		element = $( "#speed" ).selectmenu(),
@@ -70,39 +71,40 @@ test( "refresh - structure", function() {
 	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" );
+	assert.equal( options.length, menuItems.length, "menu item length" );
+	assert.equal( "Added option", menuItems.last().text(), "added item" );
+	assert.equal( "Changed value", menuItems.eq( 0 ).text(), "changed item" );
 } );
 
-asyncTest( "refresh - change selected option", function() {
-	expect( 4 );
+QUnit.test( "refresh - change selected option", function( assert ) {
+	var ready = assert.async();
+	assert.expect( 4 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" );
 
-	equal( $.trim( button.text() ), "Medium", "button text after init" );
+	assert.equal( $.trim( button.text() ), "Medium", "button text after init" );
 
 	button.simulate( "focus" );
 
 	setTimeout( function() {
-		equal( $.trim( button.text() ), "Medium", "button text after focus" );
+		assert.equal( $.trim( button.text() ), "Medium", "button text after focus" );
 
 		element[ 0 ].selectedIndex = 0;
 		element.selectmenu( "refresh" );
-		equal( $.trim( button.text() ), "Slower", "button text after changing selected option" );
+		assert.equal( $.trim( button.text() ), "Slower", "button text after changing selected option" );
 
 		element.find( "option" ).prop( "selected", false );
 		element.append( "<option selected value=\"selected_option\">Selected option</option>" );
 		element.selectmenu( "refresh" );
-		equal( $.trim( button.text() ), "Selected option", "button text after adding selected option" );
+		assert.equal( $.trim( button.text() ), "Selected option", "button text after adding selected option" );
 
-		start();
+		ready();
 	} );
 } );
 
-test( "refresh - disabled select", function() {
-	expect( 4 );
+QUnit.test( "refresh - disabled select", function( assert ) {
+	assert.expect( 4 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
@@ -111,14 +113,14 @@ test( "refresh - disabled select", function() {
 	element.prop( "disabled", true );
 	element.selectmenu( "refresh" );
 
-	ok( element.selectmenu( "option", "disabled" ), "widget option" );
-	equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
-	equal( button.attr( "tabindex" ), -1, "button tabindex" );
-	equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
+	assert.ok( element.selectmenu( "option", "disabled" ), "widget option" );
+	assert.equal( button.attr( "aria-disabled" ), "true", "button ARIA" );
+	assert.equal( button.attr( "tabindex" ), -1, "button tabindex" );
+	assert.equal( menu.attr( "aria-disabled" ), "true", "menu ARIA" );
 } );
 
-test( "refresh - disabled option", function( assert ) {
-	expect( 1 );
+QUnit.test( "refresh - disabled option", function( assert ) {
+	assert.expect( 1 );
 
 	var disabledItem,
 		element = $( "#speed" ).selectmenu(),
@@ -131,14 +133,14 @@ test( "refresh - disabled option", function( assert ) {
 	assert.hasClasses( disabledItem, "ui-state-disabled" );
 } );
 
-test( "refresh - disabled optgroup", function( assert ) {
+QUnit.test( "refresh - disabled optgroup", function( assert ) {
 	var i, item,
 		element = $( "#files" ).selectmenu(),
 		menu = element.selectmenu( "menuWidget" ).parent(),
 		originalDisabledOptgroup = element.find( "optgroup" ).first(),
 		originalDisabledOptions = originalDisabledOptgroup.find( "option" );
 
-	expect( 2 + originalDisabledOptions.length );
+	assert.expect( 2 + originalDisabledOptions.length );
 
 	originalDisabledOptgroup.prop( "disabled", true );
 	element.selectmenu( "refresh" );
@@ -147,7 +149,7 @@ test( "refresh - disabled optgroup", function( assert ) {
 
 	assert.hasClasses( item, "ui-state-disabled" );
 
-	equal(
+	assert.equal(
 		menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).filter( ".ui-state-disabled" ).length,
 		originalDisabledOptions.length,
 		"disabled options"
@@ -158,8 +160,8 @@ test( "refresh - disabled optgroup", function( assert ) {
 	}
 } );
 
-test( "refresh - remove all options", function() {
-	expect( 2 );
+QUnit.test( "refresh - remove all options", function( assert ) {
+	assert.expect( 2 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
@@ -167,23 +169,23 @@ test( "refresh - remove all options", function() {
 
 	element.children().remove();
 	element.selectmenu( "refresh" );
-	equal( button.find( ".ui-selectmenu-text" ).html(), $( "<span>&#160;</span>" ).html(),
+	assert.equal( button.find( ".ui-selectmenu-text" ).html(), $( "<span>&#160;</span>" ).html(),
 		"Empty button text" );
-	equal( menu.children().length, 0, "Empty menu" );
+	assert.equal( menu.children().length, 0, "Empty menu" );
 } );
 
-test( "widget and menuWidget", function( assert ) {
-	expect( 4 );
+QUnit.test( "widget and menuWidget", function( assert ) {
+	assert.expect( 4 );
 
 	var element = $( "#speed" ).selectmenu(),
 		button = element.selectmenu( "widget" ),
 		menu = element.selectmenu( "menuWidget" );
 
-	equal( button.length, 1, "button: one element" );
+	assert.equal( button.length, 1, "button: one element" );
 	assert.hasClasses( button, "ui-button" );
 
-	equal( menu.length, 1, "Menu Widget: one element" );
-	ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" );
+	assert.equal( menu.length, 1, "Menu Widget: one element" );
+	assert.ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" );
 } );
 
 } );