Tabs tests: Don't pollute the global namespace with helpers.

1 files changed, 45 insertions, 42 deletions

diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index 0a59ae302..61ce78189 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -1,5 +1,8 @@
 (function( $ ) {
 
+var disabled = TestHelpers.tabs.disabled,
+	state = TestHelpers.tabs.state;
+
 module( "tabs: methods" );
 
 test( "destroy", function() {
@@ -12,95 +15,95 @@ test( "enable", function() {
 	expect( 8 );
 
 	var element = $( "#tabs1" ).tabs({ disabled: true });
-	tabs_disabled( element, true );
+	disabled( element, true );
 	element.tabs( "enable" );
-	tabs_disabled( element, false );
+	disabled( element, false );
 	element.tabs( "destroy" );
 
 	element.tabs({ disabled: [ 0, 1 ] });
-	tabs_disabled( element, [ 0, 1 ] );
+	disabled( element, [ 0, 1 ] );
 	element.tabs( "enable" );
-	tabs_disabled( element, false );
+	disabled( element, false );
 });
 
 test( "enable( index )", function() {
     expect( 10 );
 
 	var element = $( "#tabs1" ).tabs({ disabled: true });
-	tabs_disabled( element, true );
+	disabled( element, true );
 	// fully disabled -> partially disabled
 	element.tabs( "enable", 1 );
-	tabs_disabled( element, [ 0, 2 ] );
+	disabled( element, [ 0, 2 ] );
 	// partially disabled -> partially disabled
 	element.tabs( "enable", 2 );
-	tabs_disabled( element, [ 0 ] );
+	disabled( element, [ 0 ] );
 	// already enabled tab, no change
 	element.tabs( "enable", 2 );
-	tabs_disabled( element, [ 0 ] );
+	disabled( element, [ 0 ] );
 	// partially disabled -> fully enabled
 	element.tabs( "enable", 0 );
-	tabs_disabled( element, false );
+	disabled( element, false );
 });
 
 test( "disable", function() {
 	expect( 8 );
 
 	var element = $( "#tabs1" ).tabs({ disabled: false });
-	tabs_disabled( element, false );
+	disabled( element, false );
 	element.tabs( "disable" );
-	tabs_disabled( element, true );
+	disabled( element, true );
 	element.tabs( "destroy" );
 
 	element.tabs({ disabled: [ 0, 1 ] });
-	tabs_disabled( element, [ 0, 1 ] );
+	disabled( element, [ 0, 1 ] );
 	element.tabs( "disable" );
-	tabs_disabled( element, true );
+	disabled( element, true );
 });
 
 test( "disable( index )", function() {
     expect( 10 );
 
 	var element = $( "#tabs1" ).tabs({ disabled: false });
-	tabs_disabled( element, false );
+	disabled( element, false );
 	// fully enabled -> partially disabled
 	element.tabs( "disable", 1 );
-	tabs_disabled( element, [ 1 ] );
+	disabled( element, [ 1 ] );
 	// partially disabled -> partially disabled
 	element.tabs( "disable", 2 );
-	tabs_disabled( element, [ 1, 2 ] );
+	disabled( element, [ 1, 2 ] );
 	// already disabled tab, no change
 	element.tabs( "disable", 2 );
-	tabs_disabled( element, [ 1, 2 ] );
+	disabled( element, [ 1, 2 ] );
 	// partially disabled -> fully disabled
 	element.tabs( "disable", 0 );
-	tabs_disabled( element, true );
+	disabled( element, true );
 });
 
 test( "refresh", function() {
 	expect( 27 );
 
 	var element = $( "#tabs1" ).tabs();
-	tabs_state( element, 1, 0, 0 );
-	tabs_disabled( element, false );
+	state( element, 1, 0, 0 );
+	disabled( element, false );
 
 	// disable tab via markup
 	element.find( ".ui-tabs-nav li" ).eq( 1 ).addClass( "ui-state-disabled" );
 	element.tabs( "refresh" );
-	tabs_state( element, 1, 0, 0 );
-	tabs_disabled( element, [ 1 ] );
+	state( element, 1, 0, 0 );
+	disabled( element, [ 1 ] );
 
 	// add remote tab
 	element.find( ".ui-tabs-nav" ).append( "<li id='newTab'><a href='data/test.html'>new</a></li>" );
 	element.tabs( "refresh" );
-	tabs_state( element, 1, 0, 0, 0 );
-	tabs_disabled( element, [ 1 ] );
+	state( element, 1, 0, 0, 0 );
+	disabled( element, [ 1 ] );
 	equal( element.find( "#" + $( "#newTab a" ).attr( "aria-controls" ) ).length, 1,
 		"panel added for remote tab" );
 
 	// remove all tabs
 	element.find( ".ui-tabs-nav li, .ui-tabs-panel" ).remove();
 	element.tabs( "refresh" );
-	tabs_state( element );
+	state( element );
 	equal( element.tabs( "option", "active" ), false, "no active tab" );
 
 	// add tabs
@@ -115,34 +118,34 @@ test( "refresh", function() {
 		.append( "<div id='newTab4'>new 4</div>" )
 		.append( "<div id='newTab5'>new 5</div>" );
 	element.tabs( "refresh" );
-	tabs_state( element, 0, 0, 0, 0 );
-	tabs_disabled( element, [ 0 ] );
+	state( element, 0, 0, 0, 0 );
+	disabled( element, [ 0 ] );
 
 	// activate third tab
 	element.tabs( "option", "active", 2 );
-	tabs_state( element, 0, 0, 1, 0 );
-	tabs_disabled( element, [ 0 ] );
+	state( element, 0, 0, 1, 0 );
+	disabled( element, [ 0 ] );
 
 	// remove fourth tab, third tab should stay active
 	element.find( ".ui-tabs-nav li" ).eq( 3 ).remove();
 	element.find( ".ui-tabs-panel" ).eq( 3 ).remove();
 	element.tabs( "refresh" );
-	tabs_state( element, 0, 0, 1 );
-	tabs_disabled( element, [ 0 ] );
+	state( element, 0, 0, 1 );
+	disabled( element, [ 0 ] );
 
 	// remove third (active) tab, second tab should become active
 	element.find( ".ui-tabs-nav li" ).eq( 2 ).remove();
 	element.find( ".ui-tabs-panel" ).eq( 2 ).remove();
 	element.tabs( "refresh" );
-	tabs_state( element, 0, 1 );
-	tabs_disabled( element, [ 0 ] );
+	state( element, 0, 1 );
+	disabled( element, [ 0 ] );
 
 	// remove first tab, previously active tab (now first) should stay active
 	element.find( ".ui-tabs-nav li" ).eq( 0 ).remove();
 	element.find( ".ui-tabs-panel" ).eq( 0 ).remove();
 	element.tabs( "refresh" );
-	tabs_state( element, 1 );
-	tabs_disabled( element, false );
+	state( element, 1 );
+	disabled( element, false );
 });
 
 asyncTest( "load", function() {
@@ -162,7 +165,7 @@ asyncTest( "load", function() {
 		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
 		equal( ui.panel.size(), 1, "panel size" );
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-		tabs_state( element, 1, 0, 0, 0, 0 );
+		state( element, 1, 0, 0, 0, 0 );
 	});
 	element.one( "tabsload", function( event, ui ) {
 		// TODO: remove wrapping in 2.0
@@ -178,11 +181,11 @@ asyncTest( "load", function() {
 		equal( uiPanel.size(), 1, "panel size" );
 		strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
 		equal( uiPanel.find( "p" ).length, 1, "panel html" );
-		tabs_state( element, 1, 0, 0, 0, 0 );
+		state( element, 1, 0, 0, 0, 0 );
 		setTimeout( tabsload1, 100 );
 	});
 	element.tabs( "load", 3 );
-	tabs_state( element, 1, 0, 0, 0, 0 );
+	state( element, 1, 0, 0, 0, 0 );
 
 	function tabsload1() {
 		// no need to test details of event (tested in events tests)
@@ -194,7 +197,7 @@ asyncTest( "load", function() {
 			setTimeout( tabsload2, 100 );
 		});
 		element.tabs( "option", "active", 3 );
-		tabs_state( element, 0, 0, 0, 1, 0 );
+		state( element, 0, 0, 0, 1, 0 );
 	}
 
 	function tabsload2() {
@@ -209,7 +212,7 @@ asyncTest( "load", function() {
 			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
 			equal( ui.panel.size(), 1, "panel size" );
 			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
-			tabs_state( element, 0, 0, 0, 1, 0 );
+			state( element, 0, 0, 0, 1, 0 );
 		});
 		element.one( "tabsload", function( event, ui ) {
 			// TODO: remove wrapping in 2.0
@@ -224,11 +227,11 @@ asyncTest( "load", function() {
 			strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
 			equal( uiPanel.size(), 1, "panel size" );
 			strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
-			tabs_state( element, 0, 0, 0, 1, 0 );
+			state( element, 0, 0, 0, 1, 0 );
 			start();
 		});
 		element.tabs( "load", 3 );
-		tabs_state( element, 0, 0, 0, 1, 0 );
+		state( element, 0, 0, 0, 1, 0 );
 	}
 });