From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 17 Jul 2010 00:20:28 +0000 (-0400)
Subject: Tabs: Updated tests.
X-Git-Tag: 1.8.3~38^2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e03d4ea9deee68e928651ef80c6c673c479b88d;p=jquery-ui.git

Tabs: Updated tests.
---

diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 269f47ed5..211237569 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -15,7 +15,8 @@
 	<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
 	<script type="text/javascript" src="../../../external/qunit.js"></script>
 	<script type="text/javascript" src="../../jquery.simulate.js"></script>
-
+	<script type="text/javascript" src="../testsuite.js"></script>
+	
 	<script type="text/javascript" src="tabs_core.js"></script>
 	<script type="text/javascript" src="tabs_defaults.js"></script>
 	<script type="text/javascript" src="tabs_events.js"></script>
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index 3eb627830..3812c3e91 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -97,7 +97,7 @@ test('remove', function() {
 });
 
 test('select', function() {
-	expect(9);
+	expect(6);
 
 	el = $('#tabs1').tabs();
 
@@ -114,21 +114,12 @@ test('select', function() {
 	el.tabs('select', -1);
 	equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in -1');
 
-	el.tabs('destroy');
-	el.tabs({ collapsible: true });
-	el.tabs('select', null);
-	equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in null (deprecated)');
-	el.tabs('select', null);
-	equals(el.tabs('option', 'selected'), -1, 'should not select tab passing in null a second time (deprecated)');
-
 	el.tabs('destroy');
 	el.tabs();
 	el.tabs('select', 0);
 	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
 	el.tabs('select', -1);
 	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
-	el.tabs('select', null);
-	equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true');
 
 	el.tabs('select', '#fragment-2');
 	equals(el.tabs('option', 'selected'), 1, 'should select tab by id');
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 2a12cb540..592f1a866 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -416,14 +416,10 @@ $.widget("ui.tabs", {
     _getIndex: function(index) {
 		// meta-function to give users option to provide a href string instead of a numerical index.
 		// also sanitizes numerical indexes to valid values.
-		if (typeof(index) == 'string') {
+		if (typeof index == 'string') {
 			index = this.anchors.index(this.anchors.filter('[href$=' + index + ']'));
-			index = (index ==-1?NaN:index);
-		}else if (typeof(index) != 'number') {
-			index = NaN;
-		}else if (index > this.anchors.length) {
-			index = this.anchors.length;
 		}
+		
 		return index;
 	},
 
@@ -579,7 +575,7 @@ $.widget("ui.tabs", {
 
 	select: function(index) {
 		index = this._getIndex(index);
-		if (isNaN(index) && this.options.collapsible) {
+		if (index == -1 && this.options.collapsible) {
 			index = this.options.selected;
 		}
 		this.anchors.eq(index).trigger(this.options.event + '.tabs');