Merge branch 'master' into effects-unit

Conflicts:
	ui/jquery.effects.pulsate.js

13 files changed, 420 insertions, 170 deletions

diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index 35103d89b..eb009064c 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -203,4 +203,20 @@ test("cancel select", function() {
 	}, 50);
 });
 
+test("blur without selection", function() {
+	expect(1);
+	var ac = $("#autocomplete").autocomplete({
+		delay: 0,
+		source: data
+	});
+	stop();
+	ac.val("j").keydown();
+	setTimeout(function() {
+		$( ".ui-menu-item" ).first().simulate("mouseover");
+		ac.simulate("keydown", { keyCode: $.ui.keyCode.TAB });
+		same( ac.val(), "j" );
+		start();
+	}, 50);
+});
+
 })(jQuery);
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 76082e780..fa346c6c9 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
 	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
+	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
 	<script type="text/javascript" src="../../../external/qunit.js"></script>
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 78f78ce38..badb837ed 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -116,8 +116,16 @@ test('baseStructure', function() {
 	ok(child.is('div.ui-datepicker-group') && child.is('div.ui-datepicker-group-last'), 'Structure multi [2] - second month division');
 	child = dp.children(':eq(2)');
 	ok(child.is('div.ui-datepicker-row-break'), 'Structure multi [2] - row break');
+	ok(dp.is('.ui-datepicker-multi-2'), 'Structure multi [2] - multi-2');
 	inp.datepicker('hide').datepicker('destroy');
 	
+	// Multi-month 3
+	inp = init('#inp', {numberOfMonths: 3});
+	inp.focus();
+	ok(dp.is('.ui-datepicker-multi-3'), 'Structure multi [3] - multi-3');
+	ok(! dp.is('.ui-datepicker-multi-2'), 'Structure multi [3] - Trac #6704');
+	inp.datepicker('hide').datepicker('destroy');
+
 	// Multi-month [2, 2]
 	inp = init('#inp', {numberOfMonths: [2, 2]});
 	inp.focus();
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 4f1e9a164..a10d1ea45 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -827,6 +827,10 @@ test('parseDate', function() {
 	equalsDate($.datepicker.parseDate('\'jour\' d \'de\' MM (\'\'DD\'\'), yy',
 		'jour 9 de Avril (\'Lundi\'), 2001', settings), new Date(2001, 4 - 1, 9),
 		'Parse date \'jour\' d \'de\' MM (\'\'DD\'\'), yy with settings');
+
+	var zh = $.datepicker.regional['zh-CN'];
+	equalsDate($.datepicker.parseDate('yy M d', '2011 十一 22', zh),
+		new Date(2011, 11 - 1, 22), 'Parse date yy M d with zh-CN');
 });
 
 test('parseDateErrors', function() {
diff --git a/tests/unit/tabs/spinner.gif b/tests/unit/tabs/spinner.gif
deleted file mode 100644
index 822747576..000000000
--- a/tests/unit/tabs/spinner.gif
+++ /dev/null
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 565a0b427..34ec28bc4 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -24,7 +24,6 @@
 	<script src="tabs_events.js"></script>
 	<script src="tabs_methods.js"></script>
 	<script src="tabs_options.js"></script>
-	<script src="tabs_tickets.js"></script>
 
 	<script>
 	function tabs_state( tabs ) {
diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index c9b16e3a8..98cb617ec 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -63,4 +63,32 @@ test( "accessibility", function() {
 	// TODO: add tests
 });
 
+test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() {
+	expect( 1 );
+
+	var element = $( "#tabs2" ).tabs({
+		active: 2,
+		beforeLoad: function( event, ui ) {
+			event.preventDefault();
+			ok( /test.html$/.test( ui.ajaxSettings.url ), "should ignore fragment identifier" );
+		}
+	});
+});
+
+test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", function() {
+	expect( 2 );
+
+	var element = $( "<div><ul><li><a href='#tab'>Tab</a></li></ul><div id='tab'></div></div>" );
+	element.appendTo( "#main" );
+	element.tabs({
+		beforeLoad: function( event, ui ) {
+			event.preventDefault();
+			ok( false, 'should not be an ajax tab');
+		}
+	});
+
+	equals( element.find( ".ui-tabs-nav a" ).attr( "aria-controls" ), "tab", "aria-contorls attribute is correct" );
+	tabs_state( element, 1 );
+});
+
 }( jQuery ) );
diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index e71fea3d4..89d08f4d0 100644
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -22,7 +22,6 @@
 	<script src="tabs_events.js"></script>
 	<script src="tabs_methods.js"></script>
 	<script src="tabs_options.js"></script>
-	<script src="tabs_tickets.js"></script>
 	<script src="tabs_deprecated.js"></script>
 
 	<script>
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 90c43037c..4b50df405 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -1,6 +1,6 @@
 (function( $ ) {
 
-module("tabs (deprecated): core");
+module( "tabs (deprecated): core" );
 
 test( "panel ids", function() {
 	expect( 2 );
@@ -20,91 +20,149 @@ test( "panel ids", function() {
 	element.tabs( "option", "active", 2 );
 });
 
-module("tabs (deprecated): options");
+module( "tabs (deprecated): options" );
 
-test('ajaxOptions', function() {
-	ok(false, "missing test - untested code is broken code.");
-});
+asyncTest( "ajaxOptions", function() {
+	expect( 1 );
 
-test('cache', function() {
-	ok(false, "missing test - untested code is broken code.");
+	var element = $( "#tabs2" ).tabs({
+		ajaxOptions: {
+			converters: {
+				"text html": function() {
+					return "test";
+				}
+			}
+		}
+	});
+	element.one( "tabsload", function( event, ui ) {
+		equals( ui.panel.html(), "test" );
+		start();
+	});
+	element.tabs( "option", "active", 2 );
 });
 
-test('idPrefix', function() {
-	ok(false, "missing test - untested code is broken code.");
-});
+asyncTest( "cache", function() {
+	expect( 5 );
 
-test('tabTemplate', function() {
-	ok(false, "missing test - untested code is broken code.");
+	var element = $( "#tabs2" ).tabs({
+		cache: true
+	});
+	element.one( "tabsshow", function( event, ui ) {
+		tabs_state( element, 0, 0, 1, 0, 0 );
+	});
+	element.one( "tabsload", function( event, ui ) {
+		ok( true, "tabsload" );
+
+		setTimeout(function() {
+			element.tabs( "option", "active", 0 );
+			tabs_state( element, 1, 0, 0, 0, 0 );
+	
+			element.one( "tabsshow", function( event, ui ) {
+				tabs_state( element, 0, 0, 1, 0, 0 );
+			});
+			element.one( "tabsload", function( event, ui ) {
+				ok( false, "should be cached" );
+			});
+			element.tabs( "option", "active", 2 );
+			start();
+		}, 1 );
+	});
+	element.tabs( "option", "active", 2 );
+	tabs_state( element, 0, 0, 1, 0, 0 );
 });
 
-test('panelTemplate', function() {
-	ok(false, "missing test - untested code is broken code.");
+test( "idPrefix", function() {
+	expect( 1 );
+
+	$( "#tabs2" )
+		.one( "tabsbeforeload", function( event, ui ) {
+			ok( /^testing-\d+$/.test( ui.panel.attr( "id" ) ), "generated id" );
+			event.preventDefault();
+		})
+		.tabs({
+			idPrefix: "testing-",
+			active: 2
+		});
 });
 
-test('cookie', function() {
-	expect(6);
+test( "tabTemplate + panelTemplate", function() {
+	// defaults are tested in the add method test
+	expect( 11 );
+
+	var element = $( "#tabs2" ).tabs({
+		tabTemplate: "<li class='customTab'><a href='http://example.com/#{href}'>#{label}</a></li>",
+		panelTemplate: "<div class='customPanel'></div>"
+	});
+	element.one( "tabsadd", function( event, ui ) {
+		var anchor = $( ui.tab );
+		equal( ui.index, 5, "ui.index" );
+		equal( anchor.text(), "New", "ui.tab" );
+		equal( anchor.attr( "href" ), "http://example.com/#new", "tab href" );
+		ok( anchor.parent().hasClass( "customTab" ), "tab custom class" );
+		equal( ui.panel.id, "new", "ui.panel" );
+		ok( $( ui.panel ).hasClass( "customPanel" ), "panel custom class" );
+	});
+	element.tabs( "add", "#new", "New" );
+	var tab = element.find( ".ui-tabs-nav li" ).last(),
+		anchor = tab.find( "a" );
+	equals( tab.text(), "New", "label" );
+	ok( tab.hasClass( "customTab" ), "tab custom class" );
+	equals( anchor.attr( "href" ), "http://example.com/#new", "href" );
+	equals( anchor.attr( "aria-controls" ), "new", "aria-controls" );
+	ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" );
+});
 
-	el = $('#tabs1');
-	var cookieName = 'tabs_test', cookieObj = { name: cookieName };
-	$.cookie(cookieName, null); // blank state
-	var cookie = function() {
-		return parseInt($.cookie(cookieName), 10);
-	};
+test( "cookie", function() {
+	expect( 6 );
 
-	el.tabs({ cookie: cookieObj });
-	equals(cookie(), 0, 'initial cookie value');
+	var element = $( "#tabs1" ),
+		cookieName = "tabs_test",
+		cookieObj = { name: cookieName };
+	$.cookie( cookieName, null );
+	function cookie() {
+		return parseInt( $.cookie( cookieName ), 10 );
+	}
 
-	el.tabs('destroy');
-	el.tabs({ active: 1, cookie: cookieObj });
-	equals(cookie(), 1, 'initial cookie value, from active property');
+	element.tabs({ cookie: cookieObj });
+	equals( cookie(), 0, "initial cookie value" );
 
-	el.tabs('option', 'active', 2);
-	equals(cookie(), 2, 'cookie value updated after activating');
+	element.tabs( "destroy" );
+	element.tabs({ active: 1, cookie: cookieObj });
+	equals( cookie(), 1, "initial cookie value, from active property" );
 
-	el.tabs('destroy');
-	$.cookie(cookieName, 1);
-	el.tabs({ cookie: cookieObj });
-	equals(cookie(), 1, 'initial cookie value, from existing cookie');
+	element.tabs( "option", "active", 2 );
+	equals( cookie(), 2, "cookie value updated after activating" );
 
-	el.tabs('destroy');
-	el.tabs({ cookie: cookieObj, collapsible: true });
-	el.tabs('option', 'active', false);
-	equals(cookie(), -1, 'cookie value for all tabs unselected');
+	element.tabs( "destroy" );
+	$.cookie( cookieName, 1 );
+	element.tabs({ cookie: cookieObj });
+	equals( cookie(), 1, "initial cookie value, from existing cookie" );
 
-	el.tabs('destroy');
-	ok($.cookie(cookieName) === null, 'erase cookie after destroy');
+	element.tabs( "destroy" );
+	element.tabs({ cookie: cookieObj, collapsible: true });
+	element.tabs( "option", "active", false );
+	equals( cookie(), -1, "cookie value for all tabs unselected" );
 
+	element.tabs( "destroy" );
+	ok( $.cookie( cookieName ) === null, "erase cookie after destroy" );
 });
 
+asyncTest( "spinner", function() {
+	expect( 2 );
 
-test('spinner', function() {
-	expect(4);
-	stop();
-
-	el = $('#tabs2');
-
-	el.tabs({
-		selected: 2,
-		load: function() {
-			// spinner: default spinner
-			setTimeout(function() {
-				equals($('li:eq(2) > a > span', el).length, 1, "should restore tab markup after spinner is removed");
-				equals($('li:eq(2) > a > span', el).html(), '3', "should restore tab label after spinner is removed");
-				el.tabs('destroy');
-				el.tabs({
-					selected: 2,
-					spinner: '<img src="spinner.gif" alt="">',
-					load: function() {
-						// spinner: image
-						equals($('li:eq(2) > a > span', el).length, 1, "should restore tab markup after spinner is removed");
-						equals($('li:eq(2) > a > span', el).html(), '3', "should restore tab label after spinner is removed");
-						start();
-					}
-				});
-			}, 1);
-		}
+	var element = $( "#tabs2" ).tabs();
+
+	element.one( "tabsbeforeload", function( event, ui ) {
+		equals( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 1, "beforeload" );
+	});
+	element.one( "tabsload", function( event, ui ) {
+		// wait until after the load finishes before checking for the spinner to be removed
+		setTimeout(function() {
+			equals( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 0, "load" );
+			start();
+		}, 1 );
 	});
+	element.tabs( "option", "active", 2 );
 });
 
 test( "selected", function() {
@@ -193,45 +251,85 @@ test( "disable", function() {
 	element.tabs( "disable", 1 );
 });
 
-test('show', function() {
-	expect(5);
 
-	var uiObj, eventObj;
-	el = $('#tabs1').tabs({
-		show: function(event, ui) {
-			uiObj = ui;
-			eventObj = event;
-		}
+test( "show", function() {
+	expect( 13 );
+
+	var element = $( "#tabs1" ).tabs({
+			active: false,
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav a" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	// from collapsed
+	element.one( "tabsshow", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		strictEqual( ui.tab, tabs[ 0 ], "ui.tab" );
+		strictEqual( ui.panel, panels[ 0 ], "ui.panel" );
+		equal( ui.index, 0, "ui.index" );
+		tabs_state( element, 1, 0, 0 );
 	});
-	ok(uiObj !== undefined, 'trigger callback after initialization');
-	equals(uiObj.tab, $('a', el)[0], 'contain tab as DOM anchor element');
-	equals(uiObj.panel, $('div', el)[0], 'contain panel as DOM div element');
-	equals(uiObj.index, 0, 'contain index');
+	element.tabs( "option", "active", 0 );
+	tabs_state( element, 1, 0, 0 );
 
-	el.find( "li:eq(1) a" ).simulate( "click" );
-	equals( eventObj.originalEvent.type, "click", "show triggered by click" );
+	// switching tabs
+	element.one( "tabsshow", function( event, ui ) {
+		equals( event.originalEvent.type, "click", "originalEvent" );
+		strictEqual( ui.tab, tabs[ 1 ], "ui.tab" );
+		strictEqual( ui.panel, panels[ 1 ], "ui.panel" );
+		equal( ui.index, 1, "ui.index" );
+		tabs_state( element, 0, 1, 0 );
+	});
+	tabs.eq( 1 ).click();
+	tabs_state( element, 0, 1, 0 );
 
+	// collapsing
+	element.one( "tabsshow", function( event, ui ) {
+		ok( false, "collapsing" );
+	});
+	element.tabs( "option", "active", false );
+	tabs_state( element, 0, 0, 0 );
 });
 
-test('select', function() {
-	expect(7);
+test( "select", function() {
+	expect( 13 );
 
-	var eventObj;
-	el = $('#tabs1').tabs({
-		select: function(event, ui) {
-			ok(true, 'select triggered after initialization');
-			equals(this, el[0], "context of callback");
-			equals(event.type, 'tabsselect', 'event type in callback');
-			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;
-		}
+	var element = $( "#tabs1" ).tabs({
+			active: false,
+			collapsible: true
+		}),
+		tabs = element.find( ".ui-tabs-nav a" ),
+		panels = element.find( ".ui-tabs-panel" );
+
+	// from collapsed
+	element.one( "tabsselect", function( event, ui ) {
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		strictEqual( ui.tab, tabs[ 0 ], "ui.tab" );
+		strictEqual( ui.panel, panels[ 0 ], "ui.panel" );
+		equal( ui.index, 0, "ui.index" );
+		tabs_state( element, 0, 0, 0 );
+	});
+	element.tabs( "option", "active", 0 );
+	tabs_state( element, 1, 0, 0 );
+
+	// switching tabs
+	element.one( "tabsselect", function( event, ui ) {
+		equals( event.originalEvent.type, "click", "originalEvent" );
+		strictEqual( ui.tab, tabs[ 1 ], "ui.tab" );
+		strictEqual( ui.panel, panels[ 1 ], "ui.panel" );
+		equal( ui.index, 1, "ui.index" );
+		tabs_state( element, 1, 0, 0 );
 	});
-	el.tabs('select', 1);
+	tabs.eq( 1 ).click();
+	tabs_state( element, 0, 1, 0 );
 
-	el.find( "li:eq(1) a" ).simulate( "click" );
-	equals( evenObj.originalEvent.type, "click", "select triggered by click" );
+	// collapsing
+	element.one( "tabsselect", function( event, ui ) {
+		ok( false, "collapsing" );
+	});
+	element.tabs( "option", "active", false );
+	tabs_state( element, 0, 0, 0 );
 });
 
 module( "tabs (deprecated): methods" );
@@ -405,4 +503,18 @@ test( "url", function() {
 	element.tabs( "option", "active", 3 );
 });
 
+asyncTest( "abort", function() {
+	expect( 1 );
+
+	var element = $( "#tabs2" ).tabs();
+	element.one( "tabsbeforeload", function( event, ui ) {
+		ui.jqXHR.error(function( jqXHR, status ) {
+			equals( status, "abort", "aborted" );
+			start();
+		});
+	});
+	element.tabs( "option", "active", 2 );
+	element.tabs( "abort" );
+});
+
 }( jQuery ) );
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index 28925a2b9..2fabaafca 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -138,15 +138,32 @@ test( "activate", function() {
 });
 
 test( "beforeLoad", function() {
-	expect( 21 );
+	expect( 32 );
 
 	var tab, panelId, panel,
-		element = $( "#tabs2" ).tabs();
+		element = $( "#tabs2" );
+
+	// init
+	element.one( "tabsbeforeload", function( event, ui ) {
+		tab = element.find( ".ui-tabs-nav a" ).eq( 2 );
+		panelId = tab.attr( "aria-controls" );
+		panel = $( "#" + panelId );
 
-	// TODO: init
-//	element.one( "tabsbeforeload", function( event, ui ) {
-//	});
-//	element.tabs({ active: 2 });
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		ok( "abort" in ui.jqXHR, "jqXHR" );
+		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
+		equals( ui.tab.size(), 1, "tab size" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equals( ui.panel.size(), 1, "panel size" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		equals( ui.panel.html(), "", "panel html" );
+		event.preventDefault();
+		tabs_state( element, 0, 0, 1, 0, 0 );
+	});
+	element.tabs({ active: 2 });
+	tabs_state( element, 0, 0, 1, 0, 0 );
+	equals( panel.html(), "", "panel html after" );
+	element.tabs( "destroy" );
 
 	// .option()
 	element.one( "tabsbeforeload", function( event, ui ) {
@@ -165,6 +182,7 @@ test( "beforeLoad", function() {
 		event.preventDefault();
 		tabs_state( element, 1, 0, 0, 0, 0 );
 	});
+	element.tabs();
 	element.tabs( "option", "active", 2 );
 	tabs_state( element, 0, 0, 1, 0, 0 );
 	equals( panel.html(), "", "panel html after" );
@@ -191,8 +209,66 @@ test( "beforeLoad", function() {
 	equals( panel.html(), "<p>testing</p>", "panel html after" );
 });
 
-test( "load", function() {
-	ok( false, "missing test - untested code is broken code." );
+asyncTest( "load", function() {
+	expect( 21 );
+
+	var tab, panelId, panel,
+		element = $( "#tabs2" );
+
+	// init
+	element.one( "tabsload", function( event, ui ) {
+		tab = element.find( ".ui-tabs-nav a" ).eq( 2 );
+		panelId = tab.attr( "aria-controls" );
+		panel = $( "#" + panelId );
+
+		ok( !( "originalEvent" in event ), "originalEvent" );
+		equals( ui.tab.size(), 1, "tab size" );
+		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+		equals( ui.panel.size(), 1, "panel size" );
+		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+		equals( ui.panel.find( "p" ).length, 1, "panel html" );
+		tabs_state( element, 0, 0, 1, 0, 0 );
+		tabsload1();
+	});
+	element.tabs({ active: 2 });
+
+	function tabsload1() {
+		// .option()
+		element.one( "tabsload", function( event, ui ) {
+			tab = element.find( ".ui-tabs-nav a" ).eq( 3 );
+			panelId = tab.attr( "aria-controls" );
+			panel = $( "#" + panelId );
+
+			ok( !( "originalEvent" in event ), "originalEvent" );
+			equals( ui.tab.size(), 1, "tab size" );
+			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+			equals( ui.panel.size(), 1, "panel size" );
+			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+			equals( ui.panel.find( "p" ).length, 1, "panel html" );
+			tabs_state( element, 0, 0, 0, 1, 0 );
+			tabsload2();
+		});
+		element.tabs( "option", "active", 3 );
+	}
+
+	function tabsload2() {
+		// click, change panel content
+		element.one( "tabsload", function( event, ui ) {
+			tab = element.find( ".ui-tabs-nav a" ).eq( 4 );
+			panelId = tab.attr( "aria-controls" );
+			panel = $( "#" + panelId );
+
+			equals( event.originalEvent.type, "click", "originalEvent" );
+			equals( ui.tab.size(), 1, "tab size" );
+			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
+			equals( ui.panel.size(), 1, "panel size" );
+			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
+			equals( ui.panel.find( "p" ).length, 1, "panel html" );
+			tabs_state( element, 0, 0, 0, 0, 1 );
+			start();
+		});
+		element.find( ".ui-tabs-nav a" ).eq( 4 ).click();
+	}
 });
 
 }( jQuery ) );
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index a6e60a4b3..221b0d39d 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -2,19 +2,10 @@
 
 module( "tabs: methods" );
 
-test('destroy', function() {
-	expect(6);
-
-	el = $('#tabs1').tabs({ collapsible: true });
-	$('li:eq(2)', el).simulate('mouseover').find('a').focus();
-	el.tabs('destroy');
-
-	ok( el.is(':not(.ui-tabs, .ui-widget, .ui-widget-content, .ui-corner-all, .ui-tabs-collapsible)'), 'remove classes from container');
-	ok( $('ul', el).is(':not(.ui-tabs-nav, .ui-helper-reset, .ui-helper-clearfix, .ui-widget-header, .ui-corner-all)'), 'remove classes from list' );
-	ok( $('div:eq(1)', el).is(':not(.ui-tabs-panel, .ui-widget-content, .ui-corner-bottom)'), 'remove classes to panel' );
-	ok( $('li:eq(0)', el).is(':not(.ui-tabs-active, .ui-state-active, .ui-corner-top)'), 'remove classes from active li');
-	ok( $('li:eq(1)', el).is(':not(.ui-state-default, .ui-corner-top)'), 'remove classes from inactive li');
-	ok( $('li:eq(2)', el).is(':not(.ui-state-hover, .ui-state-focus)'), 'remove classes from mouseovered or focused li');
+test( "destroy", function() {
+	domEqual( "#tabs1", function() {
+		$( "#tabs1" ).tabs().tabs( "destroy" );
+	});
 });
 
 test( "enable", function() {
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index 691186276..8d61c47ef 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -133,28 +133,81 @@ test( "{ collapsible: true }", function() {
 	tabs_state( element, 0, 0, 0 );
 });
 
-test('disabled', function() {
-	expect(4);
+test( "disabled", function() {
+	expect( 10 );
 
-	el = $('#tabs1').tabs();
-	same(el.tabs('option', 'disabled'), false, "should not disable any tab by default");
+	// fully enabled by default
+	var element = $( "#tabs1" ).tabs();
+	tabs_disabled( element, false );
+
+	// disable single tab
+	element.tabs( "option", "disabled", [ 1 ] );
+	tabs_disabled( element, [ 1 ] );
 
-	el.tabs('option', 'disabled', [ 1 ]);
-	same(el.tabs('option', 'disabled'), [ 1 ], "should set property"); // everything else is being tested in methods module...
+	// disabled active tab
+	element.tabs( "option", "disabled", [ 0, 1 ] );
+	tabs_disabled( element, [ 0, 1 ] );
 
-	el.tabs('option', 'disabled', [ 0, 1 ]);
-	same(el.tabs('option', 'disabled'), [ 0, 1 ], "should disable given tabs, even selected one"); // ...
+	// disable all tabs
+	element.tabs( "option", "disabled", [ 0, 1, 2 ] );
+	tabs_disabled( element, true );
 
-	el.tabs('option', 'disabled', [ ]);
-	same(el.tabs('option', 'disabled'), false, "should not disable any tab"); // ...
+	// enable all tabs
+	element.tabs( "option", "disabled", [] );
+	tabs_disabled( element, false );
 });
 
-test('event', function() {
-	ok(false, "missing test - untested code is broken code.");
+test( "{ event: null }", function() {
+	expect( 5 );
+
+	var element = $( "#tabs1" ).tabs({
+		event: null
+	});
+	tabs_state( element, 1, 0, 0 );
+
+	element.tabs( "option", "active", 1 );
+	equal( element.tabs( "option", "active" ), 1 );
+	tabs_state( element, 0, 1, 0 );
+
+	// ensure default click handler isn't bound
+	element.find( ".ui-tabs-nav a" ).eq( 2 ).click();
+	equal( element.tabs( "option", "active" ), 1 );
+	tabs_state( element, 0, 1, 0 );
 });
 
-test('fx', function() {
-	ok(false, "missing test - untested code is broken code.");
+test( "{ event: custom }", function() {
+	expect( 11 );
+
+	var element = $( "#tabs1" ).tabs({
+		event: "custom1 custom2"
+	});
+	tabs_state( element, 1, 0, 0 );
+
+	element.find( ".ui-tabs-nav a" ).eq( 1 ).trigger( "custom1" );
+	equal( element.tabs( "option", "active" ), 1 );
+	tabs_state( element, 0, 1, 0 );
+
+	// ensure default click handler isn't bound
+	element.find( ".ui-tabs-nav a" ).eq( 2 ).trigger( "click" );
+	equal( element.tabs( "option", "active" ), 1 );
+	tabs_state( element, 0, 1, 0 );
+
+	element.find( ".ui-tabs-nav a" ).eq( 2 ).trigger( "custom2" );
+	equal( element.tabs( "option", "active" ), 2 );
+	tabs_state( element, 0, 0, 1 );
+
+	element.tabs( "option", "event", "custom3" );
+
+	// ensure old event handlers are unbound
+	element.find( ".ui-tabs-nav a" ).eq( 1 ).trigger( "custom1" );
+	equal( element.tabs( "option", "active" ), 2 );
+	tabs_state( element, 0, 0, 1 );
+
+	element.find( ".ui-tabs-nav a" ).eq( 1 ).trigger( "custom3" );
+	equal( element.tabs( "option", "active" ), 1 );
+	tabs_state( element, 0, 1, 0 );
 });
 
-})(jQuery);
+// TODO: add animation tests
+
+}( jQuery ) );
diff --git a/tests/unit/tabs/tabs_tickets.js b/tests/unit/tabs/tabs_tickets.js
deleted file mode 100644
index d7a59cb5b..000000000
--- a/tests/unit/tabs/tabs_tickets.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * tabs_tickets.js
- */
-(function($) {
-
-module("tabs: tickets");
-
-test('#3627 - Ajax tab with url containing a fragment identifier fails to load', function() {
-	// http://dev.jqueryui.com/ticket/3627
-	expect(1);
-
-	el = $('#tabs2').tabs({
-		active: 2,
-		beforeLoad: function( event, ui ) {
-			event.preventDefault();
-			ok(/test.html$/.test( ui.ajaxSettings.url ), 'should ignore fragment identifier');
-		}
-	});
-});
-
-test('#4033 - IE expands hash to full url and misinterprets tab as ajax', function() {
-	// http://dev.jqueryui.com/ticket/4033
-	expect(1);
-	
-	el = $('<div><ul><li><a href="#tab">Tab</a></li></ul><div id="tab"></div></div>');
-	el.appendTo('#main');
-	el.tabs({
-		beforeLoad: function( event, ui ) {
-			event.preventDefault();
-			ok( false, 'should not be an ajax tab');
-		}
-	});
-
-	equals($('a', el).attr('aria-controls'), 'tab', 'aria-contorls attribute is correct');
-});
-
-})(jQuery);