1 files changed, 48 insertions, 1 deletions
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index c800894ff..565a0b427 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -30,8 +30,55 @@
 	function tabs_state( tabs ) {
 		var expected = $.makeArray( arguments ).slice( 1 );
 		var actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
-			return $( this ).hasClass( "ui-state-active" ) ? 1 : 0;
+			var tab = $( this ),
+				panel = $( $.ui.tabs.prototype._sanitizeSelector(
+					"#" + tab.find( "a" ).attr( "aria-controls" ) ) ),
+				tabIsActive = tab.hasClass( "ui-state-active" ),
+				panelIsActive = panel.css( "display" ) !== "none";
+
+			if ( tabIsActive && panelIsActive ) {
+				return 1;
+			}
+			if ( !tabIsActive && !panelIsActive ) {
+				return 0;
+			}
+			return -1; // mixed state - invalid
+		}).get();
+		same( actual, expected );
+	}
+
+	function tabs_disabled( tabs, state ) {
+		var expected = $.map( new Array( tabs.find ( ".ui-tabs-nav li" ).length ), function( _, index ) {
+			if ( typeof state === "boolean" ) {
+				return state ? 1 : 0;
+			} else {
+				return $.inArray( index, state ) !== -1 ? 1 : 0;
+			}
+		});
+
+		var internalState = tabs.tabs( "option", "disabled" );
+		if ( internalState === false ) {
+			internalState = [];
+		}
+		if ( internalState === true ) {
+			internalState = $.map( new Array( tabs.find( ".ui-tabs-nav li" ).length ), function( _, index ) {
+				return index;
+			});
+		}
+
+		var actual = tabs.find( ".ui-tabs-nav li" ).map(function( index ) {
+			var tab = $( this ),
+				tabIsDisabled = tab.hasClass( "ui-state-disabled" );
+
+			if ( tabIsDisabled && $.inArray( index, internalState ) !== -1 ) {
+				return 1;
+			}
+			if ( !tabIsDisabled && $.inArray( index, internalState ) === -1 ) {
+				return 0;
+			}
+			return -1; // mixed state - invalid
 		}).get();
+		same( tabs.tabs( "option", "disabled" ), state );
 		same( actual, expected );
 	}
 	</script>