Tabs: Deprecate select method. Fixes #7138 Tabs: Deprecate select method

5 files changed, 47 insertions, 41 deletions

diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 38fa6db71..1abaa0b04 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -247,6 +247,36 @@ test('remove', function() {
 	equals(el.tabs('option', 'selected'), 0, 'update selected property');
 });
 
+test('select', function() {
+	expect(6);
+
+	el = $('#tabs1').tabs();
+
+	el.tabs('select', 1);
+	equals(el.tabs('option', 'active'), 1, 'should select tab');
+
+	el.tabs('destroy');
+	el.tabs({ collapsible: true });
+	el.tabs('select', 0);
+	equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in the already active tab');
+
+	el.tabs('destroy');
+	el.tabs({ collapsible: true });
+	el.tabs('select', -1);
+	equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in -1');
+
+	el.tabs('destroy');
+	el.tabs();
+	el.tabs('select', 0);
+	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
+	el.tabs('select', -1);
+	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
+
+	el.tabs('select', '#fragment-2');
+	equals(el.tabs('option', 'active'), 1, 'should select tab by id');
+});
+
+
 test('#5069 - ui.tabs.add creates two tab panels when using a full URL', function() {
 	// http://dev.jqueryui.com/ticket/5069
 	expect(2);
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index 4fedde842..381326533 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -8,7 +8,6 @@ module("tabs: events");
 test('beforeActivate', function() {
 	expect(7);
 
-	var eventObj;
 	el = $('#tabs1').tabs({
 		beforeActivate: function(event, ui) {
 			ok(true, 'beforeActivate triggered after initialization');
@@ -17,13 +16,17 @@ test('beforeActivate', function() {
 			equals(ui.tab, el.find('a')[1], 'contain tab as DOM anchor element');
 			equals(ui.panel, el.find('div')[1], 'contain panel as DOM div element');
 			equals(ui.index, 1, 'contain index');
-			evenObj = event;
 		}
 	});
-	el.tabs('select', 1);
+	el.tabs('option', 'active', 1);
 
+	el.tabs('destroy');
+	el.tabs({
+		beforeActivate: function(event, ui) {
+			equals( event.originalEvent.type, "click", "beforeActivate triggered by click" );
+		}
+	});
 	el.find( "li:eq(1) a" ).simulate( "click" );
-	equals( evenObj.originalEvent.type, "click", "beforeActivate triggered by click" );
 });
 
 test('beforeload', function() {
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index dbb5c2d15..69dcc872e 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -130,35 +130,6 @@ test('disable', function() {
 	same(el.tabs('option', 'disabled'), true, 'set to true');
 });
 
-test('select', function() {
-	expect(6);
-
-	el = $('#tabs1').tabs();
-
-	el.tabs('select', 1);
-	equals(el.tabs('option', 'active'), 1, 'should select tab');
-
-	el.tabs('destroy');
-	el.tabs({ collapsible: true });
-	el.tabs('select', 0);
-	equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in the already active tab');
-
-	el.tabs('destroy');
-	el.tabs({ collapsible: true });
-	el.tabs('select', -1);
-	equals(el.tabs('option', 'active'), -1, 'should collapse tab passing in -1');
-
-	el.tabs('destroy');
-	el.tabs();
-	el.tabs('select', 0);
-	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
-	el.tabs('select', -1);
-	equals(el.tabs('option', 'active'), 0, 'should not collapse tab if collapsible is not set to true');
-
-	el.tabs('select', '#fragment-2');
-	equals(el.tabs('option', 'active'), 1, 'should select tab by id');
-});
-
 test('refresh', function() {
 	expect(5);
 
@@ -178,7 +149,7 @@ test('refresh', function() {
 	ul.append('<li><a href="#test1">Test 1</a></li>');
 	$('<div id="test1">Test Panel 1</div>').insertAfter( ul );
 	el.tabs('refresh');
-	el.tabs('select', 0);
+	el.tabs('option', 'active', 0);
 	equals( el.tabs('option', 'active'), 0, 'First tab added should be auto active');
 
 	ul.append('<li><a href="#test2">Test 2</a></li>');
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index b1a7a5e78..1352a68e5 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -13,8 +13,10 @@ test('collapsible', function() {
 	el.tabs({ collapsible: true });
 	equals(el.tabs('option', 'collapsible'), true, 'option set');
 	ok(el.is('.ui-tabs-collapsible'), 'extra class "ui-tabs-collapsible" attached');
-	el.tabs('select', 0);
+
+	el.tabs('option', 'active', false);
 	equals($('div.ui-tabs-hide', '#tabs1').length, 3, 'all panels should be hidden');
+
 	el.tabs('option', 'collapsible', false);
 	ok(el.is(':not(.ui-tabs-collapsible)'), 'extra class "ui-tabs-collapsible" not attached');
 
@@ -37,8 +39,8 @@ test('cookie', function() {
 	el.tabs({ active: 1, cookie: cookieObj });
 	equals(cookie(), 1, 'initial cookie value, from active property');
 
-	el.tabs('select', 2);
-	equals(cookie(), 2, 'cookie value updated after select');
+	el.tabs('option', 'active', 2);
+	equals(cookie(), 2, 'cookie value updated after activating');
 
 	el.tabs('destroy');
 	$.cookie(cookieName, 1);
@@ -47,7 +49,7 @@ test('cookie', function() {
 
 	el.tabs('destroy');
 	el.tabs({ cookie: cookieObj, collapsible: true });
-	el.tabs('select', 0);
+	el.tabs('option', 'active', false);
 	equals(cookie(), -1, 'cookie value for all tabs unselected');
 
 	el.tabs('destroy');
diff --git a/tests/unit/tabs/tabs_tickets.js b/tests/unit/tabs/tabs_tickets.js
index 486d3b6d2..9ff4d6f92 100644
--- a/tests/unit/tabs/tabs_tickets.js
+++ b/tests/unit/tabs/tabs_tickets.js
@@ -13,7 +13,7 @@ test('#2715 - id containing colon', function() {
 	ok( $('div.ui-tabs-panel:eq(0)', '#tabs2').is(':visible'), 'first panel should be visible' );
 	ok( $('div.ui-tabs-panel:eq(1)', '#tabs2').is(':hidden'), 'second panel should be hidden' );
 
-	el.tabs('select', 1).tabs('select', 0);
+	el.tabs('option', 'active', 1).tabs('option', 'active', 0);
 	ok( $('div.ui-tabs-panel:eq(0)', '#tabs2').is(':visible'), 'first panel should be visible' );
 	ok( $('div.ui-tabs-panel:eq(1)', '#tabs2').is(':hidden'), 'second panel should be hidden' );
 
@@ -30,10 +30,10 @@ test('#???? - panel containing inline style', function() {
 	el = $('#tabs2').tabs();
 	equals(inlineStyle('height'), expected, 'init should not remove inline style');
 
-	el.tabs('select', 1);
+	el.tabs('option', 'active', 1);
 	equals(inlineStyle('height'), expected, 'show tab should not remove inline style');
 
-	el.tabs('select', 0);
+	el.tabs('option', 'active', 0);
 	equals(inlineStyle('height'), expected, 'hide tab should not remove inline style');
 
 });