From 96f9c84b7b2149c6b93ac226a52065652f218e1e Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 3 Apr 2012 16:47:14 -0400
Subject: Autocomplete: Move race condition logic from ajax requests to general
 response handler. Fixes #8234 - Autocomplete: Automatic race-condition
 handling for custom sources.

---
 tests/unit/autocomplete/autocomplete_core.js | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'tests/unit')

diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js
index ef6ea58af..daeea0972 100644
--- a/tests/unit/autocomplete/autocomplete_core.js
+++ b/tests/unit/autocomplete/autocomplete_core.js
@@ -123,4 +123,33 @@ test( "allow form submit on enter when menu is not active", function() {
 	}
 })();
 
+asyncTest( "handle race condition", function() {
+	expect( 3 );
+	var count = 0,
+		element = $( "#autocomplete" ).autocomplete({
+		source: function( request, response ) {
+			count++;
+			if ( request.term.length === 1 ) {
+				equal( count, 1, "request with 1 character is first" );
+				setTimeout(function() {
+					response([ "one" ]);
+					setTimeout( checkResults, 1 );
+				}, 1 );
+				return;
+			}
+			equal( count, 2, "request with 2 characters is second" );
+			response([ "two" ]);
+		}
+	});
+
+	element.autocomplete( "search", "a" );
+	element.autocomplete( "search", "ab" );
+
+	function checkResults() {
+		equal( element.autocomplete( "widget" ).find( ".ui-menu-item" ).text(), "two",
+			"correct results displayed" );
+		start();
+	}
+});
+
 }( jQuery ) );
-- 
cgit v1.2.3


From 890a45a22c7b7a8ae5e7ff64cfd44008bb2cdb88 Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Wed, 18 Apr 2012 21:29:39 -0500
Subject: Menu: Add unit tests for testing disabled items

---
 tests/unit/menu/menu.html      | 16 +++++++++++++
 tests/unit/menu/menu_events.js | 52 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

(limited to 'tests/unit')

diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 76f4a7a31..9a598ec8d 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -251,6 +251,22 @@
 	</blockquote>
 </div>
 
+<ul id="menu6">
+	<li class="foo"><a class="foo" href="#">Aberdeen</a></li>
+	<li class="foo ui-state-disabled"><a class="foo" href="#">Ada</a></li>
+	<li class="foo"><a class="foo" href="#">Adamsville</a></li>
+	<li class="foo"><a class="foo" href="#">Addyston</a></li>
+	<li class="ui-state-disabled">
+		<a href="#">Delphi</a>
+		<ul>
+			<li class="foo"><a class="foo" href="#">Ada</a></li>
+			<li class="foo"><a class="foo" href="#">Saarland</a></li>
+			<li class="foo"><a class="foo" href="#">Salzburg</a></li>
+		</ul>
+	</li>
+	<li class="foo"><a class="foo" href="#">Saarland</a></li>
+</ul>
+
 <div id="log"></div>
 
 </div>
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index bee6fcfa6..7d127c431 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -466,4 +466,56 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 	}
 });
 
+asyncTest("handle keyboard navigation and mouse click on menu with disabled items", function() {
+	expect(6);
+	var element = $('#menu6').menu({
+		select: function(event, ui) {
+			menu_log($(ui.item[0]).text());
+		},
+		focus: function( event, ui ) {
+			menu_log($(event.target).find(".ui-state-focus").parent().index());
+		}
+	});
+
+	menu_log("keydown",true);
+	element.one( "menufocus", function( event, ui ) {
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+		equal( $("#log").html(), "1,keydown,", "Keydown focus but not select disabled item");
+		setTimeout( menukeyboard1, 50 );
+	});
+	element.focus();
+
+
+	function menukeyboard1() {
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
+		equal( $("#log").html(), "4,3,2,keydown,", "Keydown focus disabled item with submenu");
+
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
+		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
+
+		menu_log("keydown",true);
+		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+
+		setTimeout( function() {
+			equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect on disabled sub-menu)");
+
+			menu_log("keydown",true);
+			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
+
+			setTimeout( function() {
+				equal( $("#log").html(), "keydown,", "Keydown ENTER (no effect on disabled sub-menu)");
+				menu_log("click",true);
+				menu_click( element, "1" );
+				equal( $("#log").html(), "click,", "Click disabled item (no effect)");
+				start();
+			}, 50);
+		}, 50);
+	}
+});
+
 })(jQuery);
-- 
cgit v1.2.3


From a28983086ee91b19200c47fadc6bc3ba58a0fcb9 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 18 Apr 2012 22:36:15 -0400
Subject: Tests: Lint.

---
 grunt.js                              | 26 +++++++++++--
 tests/unit/spinner/spinner_core.js    |  6 +--
 tests/unit/spinner/spinner_methods.js |  2 +-
 tests/unit/spinner/spinner_options.js |  2 +-
 tests/unit/subsuite.js                | 13 +++----
 tests/unit/subsuiteRunner.js          | 26 ++++++++-----
 tests/unit/swarminject.js             |  2 +-
 tests/unit/tabs/tabs_deprecated.js    | 20 +++++-----
 tests/unit/tabs/tabs_methods.js       | 10 ++---
 tests/unit/testsuite.js               | 18 +++++----
 tests/unit/tooltip/tooltip_methods.js | 10 +++--
 tests/unit/tooltip/tooltip_options.js | 11 +++---
 tests/unit/widget/widget_core.js      | 70 ++++++++++++++++++-----------------
 tests/unit/widget/widget_extend.js    | 34 ++++++++---------
 14 files changed, 141 insertions(+), 109 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 02c889d74..0295b399c 100644
--- a/grunt.js
+++ b/grunt.js
@@ -345,13 +345,31 @@ grunt.initConfig({
 					browser: true,
 					jquery: true
 				}, defaults ),
+				// TODO: don't create so many globals in tests
 				globals: {
+					accordion_state: true,
+					asyncTest: true,
+					commonWidgetTests: true,
+					deepEqual: true,
+					dlg: true,
+					domEqual: true,
+					drag: true,
+					el: true,
+					equal: true,
+					expect: true,
+					Globalize: true,
+					menu_click: true,
+					menu_log: true,
 					module: true,
-					test: true,
 					ok: true,
-					equal: true,
-					deepEqual: true,
-					QUnit: true
+					QUnit: true,
+					spinner_simulateKeyDownUp: true,
+					start: true,
+					strictEqual: true,
+					stop: true,
+					tabs_state: true,
+					tabs_disabled: true,
+					test: true
 				}
 			}
 		};
diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js
index e12d1af2f..e38b467a3 100644
--- a/tests/unit/spinner/spinner_core.js
+++ b/tests/unit/spinner/spinner_core.js
@@ -99,7 +99,7 @@ test( "mouse click on up button, increases value not greater than max", function
 		min: 0
 	}),
 	button = element.spinner( "widget" ).find( ".ui-spinner-down" );
-	
+
 	button.trigger( "mousedown" ).trigger( "mouseup" );
 	equal( element.val(), 1 );
 	button.trigger( "mousedown" ).trigger( "mouseup" );
@@ -189,8 +189,8 @@ test( "don't clear invalid value on blur", function() {
 
 test( "precision", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( .05 ).spinner({
-		step: .0001
+	var element = $( "#spin" ).val( 0.05 ).spinner({
+		step: 0.0001
 	});
 	element.spinner( "stepUp" );
 	equal( element.val(), "0.0501", "precision from step" );
diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/spinner_methods.js
index 9c82218e1..2cb3c849f 100644
--- a/tests/unit/spinner/spinner_methods.js
+++ b/tests/unit/spinner/spinner_methods.js
@@ -54,7 +54,7 @@ test( "disable", function() {
 
 test( "enable", function() {
 	expect( 5 );
-	var element = $( "#spin" ).val( 1 ).spinner({ disabled: true })
+	var element = $( "#spin" ).val( 1 ).spinner({ disabled: true }),
 		wrapper = element.spinner( "widget" );
 
 	ok( wrapper.hasClass( "ui-spinner-disabled" ), "before: wrapper has ui-spinner-disabled class" );
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index cbad3f870..6f5090d3a 100644
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -191,7 +191,7 @@ test( "min, string", function() {
 	equal( element.spinner( "option", "min" ), -100, "option converted to number" );
 
 	element.spinner( "value", -1000 );
-	equal( element.val(), "($100.00)", "min constrained in value method")
+	equal( element.val(), "($100.00)", "min constrained in value method" );
 });
 
 test( "step, 2", function() {
diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index 03e8c9706..6f966590b 100644
--- a/tests/unit/subsuite.js
+++ b/tests/unit/subsuite.js
@@ -1,12 +1,11 @@
 (function() {
 
-var versions = [ "1.6", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7", "1.7.1", "1.7.2", "git" ];
-
-var additionalTests = {
-	accordion: [ "accordion_deprecated.html" ],
-	position: [ "position_deprecated.html" ],
-	tabs: [ "tabs_deprecated.html" ]
-};
+var versions = [ "1.6", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7", "1.7.1", "1.7.2", "git" ],
+	additionalTests = {
+		accordion: [ "accordion_deprecated.html" ],
+		position: [ "position_deprecated.html" ],
+		tabs: [ "tabs_deprecated.html" ]
+	};
 
 window.testAllVersions = function( widget ) {
 	QUnit.testSuites( $.map(
diff --git a/tests/unit/subsuiteRunner.js b/tests/unit/subsuiteRunner.js
index ddfccc7c1..2d6de2de1 100644
--- a/tests/unit/subsuiteRunner.js
+++ b/tests/unit/subsuiteRunner.js
@@ -4,13 +4,16 @@ var subsuiteFrame;
 
 QUnit.extend( QUnit, {
 	testSuites: function( suites ) {
+		function generateSuite( suite ) {
+			asyncTest( suite, function() {
+				QUnit.runSuite( suite );
+			});
+		}
+
 		for ( var i = 0; i < suites.length; i++ ) {
-			(function( suite ) {
-				asyncTest( suite, function() {
-					QUnit.runSuite( suite );
-				});
-			}( suites[i] ) );
+			generateSuite( suites[ i ] );
 		}
+
 		QUnit.done = function() {
 			subsuiteFrame.style.display = "none";
 		};
@@ -23,10 +26,12 @@ QUnit.extend( QUnit, {
 
 	testDone: function() {
 		var current = QUnit.id( this.config.current.id ),
-			children = current.children;
+			children = current.children,
+			i = 0,
+			length = children.length;
 
 		// undo the auto-expansion of failed tests
-		for ( var i = 0; i < children.length; i++ ) {
+		for ( ; i < length; i++ ) {
 			if ( children[i].nodeName === "OL" ) {
 				children[i].style.display = "none";
 			}
@@ -34,10 +39,11 @@ QUnit.extend( QUnit, {
 	},
 
 	runSuite: function( suite ) {
-		var body = document.getElementsByTagName( "body" )[0],
-			iframe = subsuiteFrame = document.createElement( "iframe" ),
-			iframeWin;
+		var iframeWin,
+			body = document.getElementsByTagName( "body" )[0],
+			iframe = document.createElement( "iframe" );
 
+		subsuiteFrame = iframe;
 		iframe.className = "qunit-subsuite";
 		body.appendChild( iframe );
 
diff --git a/tests/unit/swarminject.js b/tests/unit/swarminject.js
index db69326ab..78d37ef46 100644
--- a/tests/unit/swarminject.js
+++ b/tests/unit/swarminject.js
@@ -5,5 +5,5 @@
 	if ( !url || url.indexOf("http") !== 0 ) {
 		return;
 	}
-    document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
+    document.write( "<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date()).getTime() + "'></scr" + "ipt>" );
 })();
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 80bc4a326..c8f0e2881 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -89,10 +89,11 @@ 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>"
-	});
+	var tab, anchor,
+		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" );
@@ -103,8 +104,8 @@ test( "tabTemplate + panelTemplate", function() {
 		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" );
+	tab = element.find( ".ui-tabs-nav li" ).last();
+	anchor = tab.find( "a" );
 	equal( tab.text(), "New", "label" );
 	ok( tab.hasClass( "customTab" ), "tab custom class" );
 	equal( anchor.attr( "href" ), "http://example.com/#new", "href" );
@@ -393,7 +394,8 @@ module( "tabs (deprecated): methods" );
 test( "add", function() {
 	expect( 27 );
 
-	var element = $( "#tabs1" ).tabs();
+	var tab, anchor,
+		element = $( "#tabs1" ).tabs();
 	tabs_state( element, 1, 0, 0 );
 
 	// add without index
@@ -404,8 +406,8 @@ test( "add", function() {
 	});
 	element.tabs( "add", "#new", "New" );
 	tabs_state( element, 1, 0, 0, 0 );
-	var tab = element.find( ".ui-tabs-nav li" ).last(),
-		anchor = tab.find( "a" );
+	tab = element.find( ".ui-tabs-nav li" ).last();
+	anchor = tab.find( "a" );
 	equal( tab.text(), "New", "label" );
 	equal( anchor.attr( "href" ), "#new", "href" );
 	equal( anchor.attr( "aria-controls" ), "new", "aria-controls" );
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index fee87db96..0a59ae302 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -167,9 +167,8 @@ asyncTest( "load", function() {
 	element.one( "tabsload", function( event, ui ) {
 		// TODO: remove wrapping in 2.0
 		var uiTab = $( ui.tab ),
-			uiPanel = $( ui.panel );
-
-		var tab = element.find( ".ui-tabs-nav a" ).eq( 3 ),
+			uiPanel = $( ui.panel ),
+			tab = element.find( ".ui-tabs-nav a" ).eq( 3 ),
 			panelId = tab.attr( "aria-controls" ),
 			panel = $( "#" + panelId );
 
@@ -215,9 +214,8 @@ asyncTest( "load", function() {
 		element.one( "tabsload", function( event, ui ) {
 			// TODO: remove wrapping in 2.0
 			var uiTab = $( ui.tab ),
-				uiPanel = $( ui.panel );
-
-			var tab = element.find( ".ui-tabs-nav a" ).eq( 3 ),
+				uiPanel = $( ui.panel ),
+				tab = element.find( ".ui-tabs-nav a" ).eq( 3 ),
 				panelId = tab.attr( "aria-controls" ),
 				panel = $( "#" + panelId );
 
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index d37e27f7b..2ef6bf472 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -63,7 +63,7 @@ window.commonWidgetTests = function( widget, settings ) {
 	test( "version", function() {
 		ok( "version" in $.ui[ widget ].prototype, "version property exists" );
 	});
-}
+};
 
 /*
  * Experimental assertion for comparing DOM objects.
@@ -72,20 +72,22 @@ window.commonWidgetTests = function( widget, settings ) {
  * Then compares the result using deepEqual.
  */
 window.domEqual = function( selector, modifier, message ) {
-	var attributes = ["class", "role", "id", "tabIndex", "aria-activedescendant"];
+	var expected, actual,
+		attributes = ["class", "role", "id", "tabIndex", "aria-activedescendant"];
 
 	function extract(value) {
 		if (!value || !value.length) {
 			QUnit.push( false, actual, expected, "domEqual failed, can't extract " + selector + ", message was: " + message );
 			return;
 		}
-		var result = {};
+		var children,
+			result = {};
 		result.nodeName = value[0].nodeName;
 		$.each(attributes, function(index, attr) {
 			result[attr] = value.prop(attr);
 		});
 		result.children = [];
-		var children = value.children();
+		children = value.children();
 		if (children.length) {
 			children.each(function() {
 				result.children.push(extract($(this)));
@@ -95,11 +97,11 @@ window.domEqual = function( selector, modifier, message ) {
 		}
 		return result;
 	}
-	var expected = extract($(selector));
-	modifier($(selector));
+	expected = extract( $( selector ) );
+	modifier( $( selector ) );
 
-	var actual = extract($(selector));
+	actual = extract( $( selector ) );
 	QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
-}
+};
 
 }());
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index 3e8256c50..eaab1c0d1 100644
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -16,11 +16,12 @@ test( "destroy", function() {
 test( "open/close", function() {
 	expect( 3 );
 	$.fx.off = true;
-	var element = $( "#tooltipped1" ).tooltip();
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip();
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
 
 	element.tooltip( "open" );
-	var tooltip = $( "#" + element.attr( "aria-describedby" ) );
+	tooltip = $( "#" + element.attr( "aria-describedby" ) );
 	ok( tooltip.is( ":visible" ) );
 
 	element.tooltip( "close" );
@@ -31,11 +32,12 @@ test( "open/close", function() {
 test( "enable/disable", function() {
 	expect( 7 );
 	$.fx.off = true;
-	var element = $( "#tooltipped1" ).tooltip();
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip();
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
 
 	element.tooltip( "open" );
-	var tooltip = $( "#" + element.attr( "aria-describedby" ) );
+	tooltip = $( "#" + element.attr( "aria-describedby" ) );
 	ok( tooltip.is( ":visible" ) );
 
 	element.tooltip( "disable" );
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index 42529e087..4f994f8de 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -45,11 +45,12 @@ asyncTest( "content: sync + async callback", function() {
 
 test( "items", function() {
 	expect( 2 );
-	var element = $( "#qunit-fixture" ).tooltip({
-		items: "#fixture-span"
-	});
+	var event,
+		element = $( "#qunit-fixture" ).tooltip({
+			items: "#fixture-span"
+		});
 
-	var event = $.Event( "mouseenter" );
+	event = $.Event( "mouseenter" );
 	event.target = $( "#fixture-span" )[ 0 ];
 	element.tooltip( "open", event );
 	deepEqual( $( "#" + $( "#fixture-span" ).attr( "aria-describedby" ) ).text(), "title-text" );
@@ -63,7 +64,7 @@ test( "items", function() {
 });
 
 test( "tooltipClass", function() {
-	expect( 1 )
+	expect( 1 );
 	var element = $( "#tooltipped1" ).tooltip({
 		tooltipClass: "custom"
 	}).tooltip( "open" );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index e104d4ae9..38495e282 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -84,7 +84,8 @@ test( "custom selector expression", function() {
 test( "jQuery usage", function() {
 	expect( 16 );
 
-	var shouldCreate = false;
+	var elem, instance, ret, bcInstance,
+		shouldCreate = false;
 
 	$.widget( "ui.testWidget", {
 		getterSetterVal: 5,
@@ -113,22 +114,22 @@ test( "jQuery usage", function() {
 	});
 
 	shouldCreate = true;
-	var elem = $( "<div>" )
+	elem = $( "<div>" )
 		.bind( "testwidgetcreate", function() {
 			ok( shouldCreate, "create event triggered on instantiation" );
 		})
 		.testWidget();
 	shouldCreate = false;
 
-	var instance = elem.data( "ui-testWidget" );
+	instance = elem.data( "ui-testWidget" );
 	equal( typeof instance, "object", "instance stored in .data(pluginName)" );
 	equal( instance.element[0], elem[0], "element stored on widget" );
-	var ret = elem.testWidget( "methodWithParams", "value1", "value2" );
+	ret = elem.testWidget( "methodWithParams", "value1", "value2" );
 	equal( ret, elem, "jQuery object returned from method call" );
 
 	// 1.9 BC for #7810
 	// TODO remove
-	var bcInstance = elem.data("testWidget");
+	bcInstance = elem.data("testWidget");
 	equal( typeof bcInstance, "object", "instance stored in .data(pluginName)" );
 	equal( bcInstance.element[0], elem[0], "element stored on widget" );
 
@@ -148,7 +149,8 @@ test( "jQuery usage", function() {
 test( "direct usage", function() {
 	expect( 9 );
 
-	var shouldCreate = false;
+	var elem, instance, ret,
+		shouldCreate = false;
 
 	$.widget( "ui.testWidget", {
 		getterSetterVal: 5,
@@ -171,17 +173,17 @@ test( "direct usage", function() {
 		}
 	});
 
-	var elem = $( "<div>" )[ 0 ];
+	elem = $( "<div>" )[ 0 ];
 
 	shouldCreate = true;
-	var instance = new $.ui.testWidget( {}, elem );
+	instance = new $.ui.testWidget( {}, elem );
 	shouldCreate = false;
 
 	equal( $( elem ).data( "ui-testWidget" ), instance,
 		"instance stored in .data(pluginName)" );
 	equal( instance.element[ 0 ], elem, "element stored on widget" );
 
-	var ret = instance.methodWithParams( "value1", "value2" );
+	ret = instance.methodWithParams( "value1", "value2" );
 	equal( ret, instance, "plugin returned from method call" );
 
 	ret = instance.getterSetterMethod();
@@ -439,11 +441,12 @@ test( ".option() - getter", function() {
 		_create: function() {}
 	});
 
-	var div = $( "<div>" ).testWidget({
-		foo: "bar",
-		baz: 5,
-		qux: [ "quux", "quuux" ]
-	});
+	var options,
+		div = $( "<div>" ).testWidget({
+			foo: "bar",
+			baz: 5,
+			qux: [ "quux", "quuux" ]
+		});
 
 	deepEqual( div.testWidget( "option", "x" ), null, "non-existent option" );
 	deepEqual( div.testWidget( "option", "foo"), "bar", "single option - string" );
@@ -451,7 +454,7 @@ test( ".option() - getter", function() {
 	deepEqual( div.testWidget( "option", "qux"), [ "quux", "quuux" ],
 		"single option - array" );
 
-	var options = div.testWidget( "option" );
+	options = div.testWidget( "option" );
 	deepEqual( options, {
 		create: null,
 		disabled: false,
@@ -483,14 +486,15 @@ test( ".option() - deep option getter", function() {
 });
 
 test( ".option() - delegate to ._setOptions()", function() {
-	var calls = [];
+	var div,
+		calls = [];
 	$.widget( "ui.testWidget", {
 		_create: function() {},
 		_setOptions: function( options ) {
 			calls.push( options );
 		}
 	});
-	var div = $( "<div>" ).testWidget();
+	div = $( "<div>" ).testWidget();
 
 	calls = [];
 	div.testWidget( "option", "foo", "bar" );
@@ -506,7 +510,8 @@ test( ".option() - delegate to ._setOptions()", function() {
 });
 
 test( ".option() - delegate to ._setOption()", function() {
-	var calls = [];
+	var div,
+		calls = [];
 	$.widget( "ui.testWidget", {
 		_create: function() {},
 		_setOption: function( key, val ) {
@@ -516,7 +521,7 @@ test( ".option() - delegate to ._setOption()", function() {
 			});
 		}
 	});
-	var div = $( "<div>" ).testWidget();
+	div = $( "<div>" ).testWidget();
 
 	calls = [];
 	div.testWidget( "option", "foo", "bar" );
@@ -603,7 +608,7 @@ test( ".widget() - overriden", function() {
 
 test( "._bind() to element (default)", function() {
 	expect( 12 );
-	var that;
+	var that, widget;
 	$.widget( "ui.testWidget", {
 		_create: function() {
 			that = this;
@@ -623,7 +628,7 @@ test( "._bind() to element (default)", function() {
 			equal( "keydown", event.type );
 		}
 	});
-	var widget = $( "<div></div>" )
+	widget = $( "<div></div>" )
 		.testWidget()
 		.trigger( "keyup" )
 		.trigger( "keydown" );
@@ -643,7 +648,7 @@ test( "._bind() to element (default)", function() {
 
 test( "._bind() to descendent", function() {
 	expect( 12 );
-	var that;
+	var that, widget, descendant;
 	$.widget( "ui.testWidget", {
 		_create: function() {
 			that = this;
@@ -664,28 +669,28 @@ test( "._bind() to descendent", function() {
 		}
 	});
 	// trigger events on both widget and descendent to ensure that only descendent receives them
-	var widget = $( "<div><p><strong>hello</strong> world</p></div>" )
+	widget = $( "<div><p><strong>hello</strong> world</p></div>" )
 		.testWidget()
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-	var descendent = widget.find( "strong" )
+	descendant = widget.find( "strong" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
 	widget
 		.testWidget( "disable" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-	descendent
+	descendant
 		.trigger( "keyup" )
 		.trigger( "keydown" );
 	widget
 		.testWidget( "enable" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-	descendent
+	descendant
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-	descendent
+	descendant
 		.addClass( "ui-state-disabled" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
@@ -693,7 +698,7 @@ test( "._bind() to descendent", function() {
 		.testWidget( "destroy" )
 		.trigger( "keyup" )
 		.trigger( "keydown" );
-	descendent
+	descendant
 		.trigger( "keyup" )
 		.trigger( "keydown" );
 });
@@ -942,10 +947,10 @@ test( "._trigger() - array as ui", function() {
 						qux: 5,
 						quux: 20
 					}
+				},
+				extra = {
+					bar: 5
 				};
-			var extra = {
-				bar: 5
-			};
 			this._trigger( "foo", null, [ ui, extra ] );
 		}
 	});
@@ -983,8 +988,7 @@ test( "._trigger() - instance as element", function() {
 	$.widget( "ui.testWidget", {
 		defaultElement: null,
 		testEvent: function() {
-			var ui = { foo: "bar" };
-			this._trigger( "foo", null, ui );
+			this._trigger( "foo", null, { foo: "bar" } );
 		}
 	});
 	var instance = $.ui.testWidget({
diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/widget_extend.js
index 90e686e18..36cd999dd 100644
--- a/tests/unit/widget/widget_extend.js
+++ b/tests/unit/widget/widget_extend.js
@@ -1,7 +1,9 @@
 test( "$.widget.extend()", function() {
 	expect( 26 );
 
-	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+	var ret, empty, optionsWithLength, optionsWithDate, myKlass, customObject, optionsWithCustomObject, nullUndef,
+		target, recursive, obj, input, output,
+		settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
 		optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
 		merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
@@ -10,8 +12,7 @@ test( "$.widget.extend()", function() {
 		deep2copy = { foo: { baz: true }, foo2: document },
 		deepmerged = { foo: { bar: true, baz: true }, foo2: document },
 		arr = [1, 2, 3],
-		nestedarray = { arr: arr },
-		ret;
+		nestedarray = { arr: arr };
 
 	$.widget.extend( settings, options );
 	deepEqual( settings, merged, "Check if extended: settings must be extended" );
@@ -25,19 +26,19 @@ test( "$.widget.extend()", function() {
 	strictEqual( $.widget.extend({}, nestedarray).arr, arr, "Don't clone arrays" );
 	ok( $.isPlainObject( $.widget.extend({ arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
 
-	var empty = {};
-	var optionsWithLength = { foo: { length: -1 } };
+	empty = {};
+	optionsWithLength = { foo: { length: -1 } };
 	$.widget.extend( empty, optionsWithLength );
 	deepEqual( empty.foo, optionsWithLength.foo, "The length property must copy correctly" );
 
 	empty = {};
-	var optionsWithDate = { foo: { date: new Date } };
+	optionsWithDate = { foo: { date: new Date() } };
 	$.widget.extend( empty, optionsWithDate );
 	deepEqual( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
 
-	var myKlass = function() {};
-	var customObject = new myKlass();
-	var optionsWithCustomObject = { foo: { date: customObject } };
+	myKlass = function() {};
+	customObject = new myKlass();
+	optionsWithCustomObject = { foo: { date: customObject } };
 	empty = {};
 	$.widget.extend( empty, optionsWithCustomObject );
 	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly (no methods)" );
@@ -48,10 +49,9 @@ test( "$.widget.extend()", function() {
 	$.widget.extend( empty, optionsWithCustomObject );
 	strictEqual( empty.foo.date, customObject, "Custom objects copy correctly" );
 
-	ret = $.widget.extend({ foo: 4 }, { foo: new Number(5) } );
+	ret = $.widget.extend({ foo: 4 }, { foo: Number(5) } );
 	equal( ret.foo, 5, "Wrapped numbers copy correctly" );
 
-	var nullUndef;
 	nullUndef = $.widget.extend( {}, options, { xnumber2: null } );
 	strictEqual( nullUndef.xnumber2, null, "Check to make sure null values are copied");
 
@@ -61,8 +61,8 @@ test( "$.widget.extend()", function() {
 	nullUndef = $.widget.extend( {}, options, { xnumber0: null } );
 	strictEqual( nullUndef.xnumber0, null, "Check to make sure null values are inserted");
 
-	var target = {};
-	var recursive = { foo:target, bar:5 };
+	target = {};
+	recursive = { foo:target, bar:5 };
 	$.widget.extend( target, recursive );
 	deepEqual( target, { foo: {}, bar: 5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
 
@@ -75,7 +75,7 @@ test( "$.widget.extend()", function() {
 	ret = $.widget.extend( { foo:"bar" }, { foo:null } );
 	strictEqual( typeof ret.foo, "object", "Make sure a null value doesn't crash with deep extend, for #1908" );
 
-	var obj = { foo:null };
+	obj = { foo:null };
 	$.widget.extend( obj, { foo:"notnull" } );
 	equal( obj.foo, "notnull", "Make sure a null value can be overwritten" );
 
@@ -87,16 +87,16 @@ test( "$.widget.extend()", function() {
 		options2Copy = { xstring2: "xx", xxx: "newstringx" },
 		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
 
-	var settings = $.widget.extend( {}, defaults, options1, options2 );
+	settings = $.widget.extend( {}, defaults, options1, options2 );
 	deepEqual( settings, merged2, "Check if extended: settings must be extended" );
 	deepEqual( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
 	deepEqual( options1, options1Copy, "Check if not modified: options1 must not be modified" );
 	deepEqual( options2, options2Copy, "Check if not modified: options2 must not be modified" );
 
-	var input = {
+	input = {
 		key: [ 1, 2, 3 ]
 	};
-	var output = $.widget.extend( {}, input );
+	output = $.widget.extend( {}, input );
 	deepEqual( input, output, "don't clone arrays" );
 	input.key[0] = 10;
 	deepEqual( input, output, "don't clone arrays" );
-- 
cgit v1.2.3


From a0fb2c227e66c7b034726943a96360829a5ad3b2 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Wed, 18 Apr 2012 22:46:39 -0400
Subject: Tests: Lint.

---
 tests/unit/progressbar/progressbar_events.js |  2 +-
 tests/unit/resizable/resizable_methods.js    |  2 +-
 tests/unit/selectable/selectable_methods.js  | 16 ++++---
 tests/unit/selectable/selectable_options.js  |  6 +--
 tests/unit/slider/slider_methods.js          | 14 +++---
 tests/unit/slider/slider_options.js          | 10 ++---
 tests/unit/sortable/sortable_events.js       | 64 ++++++++++++++--------------
 tests/unit/sortable/sortable_methods.js      |  4 +-
 tests/unit/sortable/sortable_tickets.js      |  4 +-
 9 files changed, 63 insertions(+), 59 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/progressbar/progressbar_events.js b/tests/unit/progressbar/progressbar_events.js
index 8d7b8868d..f3713171b 100644
--- a/tests/unit/progressbar/progressbar_events.js
+++ b/tests/unit/progressbar/progressbar_events.js
@@ -15,7 +15,7 @@ test("create", function() {
 		change: function() {
 			ok(false, 'create() has triggered change()');
 		}
-	})
+	});
 });
 
 test("change", function() {
diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/resizable_methods.js
index 03e91d440..2b4c4256c 100644
--- a/tests/unit/resizable/resizable_methods.js
+++ b/tests/unit/resizable/resizable_methods.js
@@ -20,7 +20,7 @@ test("init", function() {
 	$('<div></div>').resizable().resizable("foo").remove();
 	ok(true, 'arbitrary method called after init');
 
-	el = $('<div></div>').resizable()
+	el = $('<div></div>').resizable();
 	var foo = el.resizable("option", "foo");
 	el.remove();
 	ok(true, 'arbitrary option getter after init');
diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js
index 32dfe00ed..dbc88f269 100644
--- a/tests/unit/selectable/selectable_methods.js
+++ b/tests/unit/selectable/selectable_methods.js
@@ -20,7 +20,7 @@ test("init", function() {
 	$("<div></div>").selectable().selectable("foo").remove();
 	ok(true, 'arbitrary method called after init');
 
-	el = $("<div></div>").selectable()
+	el = $("<div></div>").selectable();
 	var foo = el.selectable("option", "foo");
 	el.remove();
 	ok(true, 'arbitrary option getter after init');
@@ -49,7 +49,8 @@ test("destroy", function() {
 
 test("enable", function() {
 	expect(3);
-	var fired = false;
+	var expected, actual,
+		fired = false;
 
 	el = $("#selectable1");
 	el.selectable({
@@ -63,14 +64,15 @@ test("enable", function() {
 	equal(fired, true, "start fired");
 	el.selectable("destroy");
 
-	var expected = $('<div></div>').selectable(),
-		actual = expected.selectable('enable');
+	expected = $('<div></div>').selectable();
+	actual = expected.selectable('enable');
 	equal(actual, expected, 'enable is chainable');
 });
 
 test("disable", function() {
 	expect(3);
-	var fired = false;
+	var expected, actual,
+		fired = false;
 
 	el = $("#selectable1");
 	el.selectable({
@@ -85,8 +87,8 @@ test("disable", function() {
 	equal(fired, false, "start fired");
 	el.selectable("destroy");
 
-	var expected = $('<div></div>').selectable(),
-		actual = expected.selectable('disable');
+	expected = $('<div></div>').selectable();
+	actual = expected.selectable('disable');
 	equal(actual, expected, 'disable is chainable');
 });
 
diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js
index 2bc44e6e0..be9fdf5fe 100644
--- a/tests/unit/selectable/selectable_options.js
+++ b/tests/unit/selectable/selectable_options.js
@@ -8,7 +8,7 @@ module("selectable: options");
 test("autoRefresh", function() {
 	expect(3);
 	el = $("#selectable1");
-	var actual, sel = $("*", el), selected = function() { actual += 1 };
+	var actual, sel = $("*", el), selected = function() { actual += 1; };
 
 	actual = 0;
 	el = $("#selectable1").selectable({ autoRefresh: false,	selected: selected });
@@ -33,12 +33,12 @@ test("autoRefresh", function() {
 test("filter", function() {
 	expect(2);
 	el = $("#selectable1");
-	var actual, sel = $("*", el), selected = function() { actual += 1 };
+	var actual, sel = $("*", el), selected = function() { actual += 1; };
 
 	actual = 0;
 	el = $("#selectable1").selectable({ filter: '.special', selected: selected });
 	drag(1000, 1000);
-	ok(sel.length != 1, "this test assumes more than 1 selectee");
+	ok(sel.length !== 1, "this test assumes more than 1 selectee");
 	equal(actual, 1);
 	el.selectable("destroy");
 });
diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js
index b46222002..79f80e868 100644
--- a/tests/unit/slider/slider_methods.js
+++ b/tests/unit/slider/slider_methods.js
@@ -17,8 +17,8 @@ test("init", function() {
 	$('<div></div>').slider().remove();
 	ok(true, '.slider() called on disconnected DOMElement');
 
-	var el = $('<div></div>').slider();
-	var foo = el.slider("option", "foo");
+	var el = $('<div></div>').slider(),
+		foo = el.slider("option", "foo");
 	el.remove();
 	ok(true, 'arbitrary option getter after init');
 
@@ -42,11 +42,12 @@ test("destroy", function() {
 });
 
 test("enable", function() {
-	var expected = $('<div></div>').slider(),
+	var el,
+		expected = $('<div></div>').slider(),
 		actual = expected.slider('enable');
 	equal(actual, expected, 'enable is chainable');
 
-	var el = $('<div></div>').slider({ disabled: true });
+	el = $('<div></div>').slider({ disabled: true });
 	ok(el.hasClass('ui-disabled'), 'slider has ui-disabled class before enable method call');
 	ok(el.hasClass('ui-slider-disabled'), 'slider has ui-slider-disabled class before enable method call');
 	el.slider('enable');
@@ -55,11 +56,12 @@ test("enable", function() {
 });
 
 test("disable", function() {
-	var expected = $('<div></div>').slider(),
+	var el,
+		expected = $('<div></div>').slider(),
 		actual = expected.slider('disable');
 	equal(actual, expected, 'disable is chainable');
 
-	var el = $('<div></div>').slider({ disabled: false });
+	el = $('<div></div>').slider({ disabled: false });
 	ok(!el.hasClass('ui-disabled'), 'slider does not have ui-disabled class before disabled method call');
 	ok(!el.hasClass('ui-slider-disabled'), 'slider does not have ui-slider-disabled class before disable method call');
 	el.slider('disable');
diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js
index 7d9899284..09067a3e9 100644
--- a/tests/unit/slider/slider_options.js
+++ b/tests/unit/slider/slider_options.js
@@ -23,8 +23,8 @@ test("max", function() {
 	};
 
 	el.slider(options);
-	ok(el.slider("option", "value") == options.value, "value option is not contained by max");
-	ok(el.slider("value") == options.max, "value method is contained by max");
+	ok(el.slider("option", "value") === options.value, "value option is not contained by max");
+	ok(el.slider("value") === options.max, "value method is contained by max");
 	el.slider('destroy');
 
 });
@@ -41,8 +41,8 @@ test("min", function() {
 	};
 
 	el.slider(options);
-	ok(el.slider("option", "value") == options.value, "value option is not contained by min");
-	ok(el.slider("value") == options.min, "value method is contained by min");
+	ok(el.slider("option", "value") === options.value, "value option is not contained by min");
+	ok(el.slider("value") === options.min, "value method is contained by min");
 	el.slider('destroy');
 
 });
@@ -73,7 +73,7 @@ test("orientation", function() {
 		value: -1
 	};
 
-	var percentVal = (options.value - options.min) / (options.max - options.min) * 100;
+	percentVal = (options.value - options.min) / (options.max - options.min) * 100;
 
 	el.slider(options).slider("option", "orientation", "vertical");
 	ok(el.is('.ui-slider-vertical'), "vertical slider has class .ui-slider-vertical");
diff --git a/tests/unit/sortable/sortable_events.js b/tests/unit/sortable/sortable_events.js
index cb4ff4ff3..6ed54e1b6 100644
--- a/tests/unit/sortable/sortable_events.js
+++ b/tests/unit/sortable/sortable_events.js
@@ -6,13 +6,13 @@
 module("sortable: events");
 
 test("start", function() {
-	
+
 	var hash;
 	$("#sortable")
 		.sortable({ start: function(e, ui) { hash = ui; } })
 		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 10 });
-	
-	ok(hash, 'start event triggered');	
+
+	ok(hash, 'start event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
 	ok(hash.placeholder, 'UI hash includes: placeholder');
 	ok(hash.position && (hash.position.top && hash.position.left), 'UI hash includes: position');
@@ -20,104 +20,104 @@ test("start", function() {
 	ok(hash.item, 'UI hash includes: item');
 	ok(!hash.sender, 'UI hash does not include: sender');
 
-			
+
 });
 
 test("sort", function() {
-	
+
 	var hash;
 	$("#sortable")
 		.sortable({ sort: function(e, ui) { hash = ui; } })
 		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 10 });
-	
-	ok(hash, 'sort event triggered');	
+
+	ok(hash, 'sort event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
 	ok(hash.placeholder, 'UI hash includes: placeholder');
 	ok(hash.position && (hash.position.top && hash.position.left), 'UI hash includes: position');
 	ok(hash.offset && (hash.offset.top && hash.offset.left), 'UI hash includes: offset');
 	ok(hash.item, 'UI hash includes: item');
 	ok(!hash.sender, 'UI hash does not include: sender');
-	
+
 });
 
 test("change", function() {
-	
+
 	var hash;
 	$("#sortable")
 		.sortable({ change: function(e, ui) { hash = ui; } })
 		.find('li:eq(0)').simulate("drag", { dx: 1, dy: 1 });
-	
+
 	ok(!hash, '1px drag, change event should not be triggered');
-	
+
 	$("#sortable")
 		.sortable({ change: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });	
-		
-	ok(hash, 'change event triggered');	
+		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });
+
+	ok(hash, 'change event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
 	ok(hash.placeholder, 'UI hash includes: placeholder');
 	ok(hash.position && (hash.position.top && hash.position.left), 'UI hash includes: position');
 	ok(hash.offset && (hash.offset.top && hash.offset.left), 'UI hash includes: offset');
 	ok(hash.item, 'UI hash includes: item');
 	ok(!hash.sender, 'UI hash does not include: sender');
-	
+
 });
 
 test("beforeStop", function() {
-	
+
 	var hash;
 	$("#sortable")
 		.sortable({ beforeStop: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });	
-		
-	ok(hash, 'beforeStop event triggered');	
+		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });
+
+	ok(hash, 'beforeStop event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
 	ok(hash.placeholder, 'UI hash includes: placeholder');
 	ok(hash.position && (hash.position.top && hash.position.left), 'UI hash includes: position');
 	ok(hash.offset && (hash.offset.top && hash.offset.left), 'UI hash includes: offset');
 	ok(hash.item, 'UI hash includes: item');
 	ok(!hash.sender, 'UI hash does not include: sender');
-	
+
 });
 
 test("stop", function() {
-	
+
 	var hash;
 	$("#sortable")
 		.sortable({ stop: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });	
-		
-	ok(hash, 'stop event triggered');	
+		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });
+
+	ok(hash, 'stop event triggered');
 	ok(!hash.helper, 'UI should not include: helper');
 	ok(hash.placeholder, 'UI hash includes: placeholder');
 	ok(hash.position && (hash.position.top && hash.position.left), 'UI hash includes: position');
 	ok(hash.offset && (hash.offset.top && hash.offset.left), 'UI hash includes: offset');
 	ok(hash.item, 'UI hash includes: item');
 	ok(!hash.sender, 'UI hash does not include: sender');
-	
+
 });
 
 test("update", function() {
-	
+
 	var hash;
 	$("#sortable")
 		.sortable({ update: function(e, ui) { hash = ui; } })
 		.find('li:eq(0)').simulate("drag", { dx: 1, dy: 1 });
-	
+
 	ok(!hash, '1px drag, update event should not be triggered');
-	
+
 	$("#sortable")
 		.sortable({ update: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });	
-		
-	ok(hash, 'update event triggered');	
+		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });
+
+	ok(hash, 'update event triggered');
 	ok(!hash.helper, 'UI hash should not include: helper');
 	ok(hash.placeholder, 'UI hash includes: placeholder');
 	ok(hash.position && (hash.position.top && hash.position.left), 'UI hash includes: position');
 	ok(hash.offset && (hash.offset.top && hash.offset.left), 'UI hash includes: offset');
 	ok(hash.item, 'UI hash includes: item');
 	ok(!hash.sender, 'UI hash does not include: sender');
-	
+
 });
 
 test("receive", function() {
diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/sortable_methods.js
index 2446d2755..c2a0b9548 100644
--- a/tests/unit/sortable/sortable_methods.js
+++ b/tests/unit/sortable/sortable_methods.js
@@ -5,7 +5,7 @@
 
 var el, offsetBefore, offsetAfter, dragged;
 
-var drag = function(handle, dx, dy) {
+function drag(handle, dx, dy) {
 	offsetBefore = $(handle).offset();
 	$(handle).simulate("drag", {
 		dx: dx || 0,
@@ -15,7 +15,7 @@ var drag = function(handle, dx, dy) {
 	offsetAfter = $(handle).offset();
 }
 
-var sort = function(handle, dx, dy, index, msg) {
+function sort(handle, dx, dy, index, msg) {
 	drag(handle, dx, dy);
 	equal($(handle).parent().children().index(handle), index, msg);
 }
diff --git a/tests/unit/sortable/sortable_tickets.js b/tests/unit/sortable/sortable_tickets.js
index 6ee503a58..22ad61baf 100644
--- a/tests/unit/sortable/sortable_tickets.js
+++ b/tests/unit/sortable/sortable_tickets.js
@@ -5,7 +5,7 @@
 
 var el, offsetBefore, offsetAfter, dragged;
 
-var drag = function(handle, dx, dy) {
+function drag(handle, dx, dy) {
 	offsetBefore = $(handle).offset();
 	$(handle).simulate("drag", {
 		dx: dx || 0,
@@ -15,7 +15,7 @@ var drag = function(handle, dx, dy) {
 	offsetAfter = $(handle).offset();
 }
 
-var sort = function(handle, dx, dy, index, msg) {
+function sort(handle, dx, dy, index, msg) {
 	drag(handle, dx, dy);
 	equal($(handle).parent().children().index(handle), index, msg);
 }
-- 
cgit v1.2.3


From aa187f57d16aae5cf5181cd967a385439b09c2ce Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 09:39:21 -0400
Subject: Tests: Lint

---
 grunt.js                                    |   1 +
 tests/unit/effects/effects_core.js          |  17 ++--
 tests/unit/effects/effects_scale.js         |  19 ++--
 tests/unit/menu/menu_core.js                |   9 +-
 tests/unit/menu/menu_events.js              |  13 +--
 tests/unit/position/position_core.js        |  40 ++++-----
 tests/unit/position/position_core_within.js | 133 +++++++++++++---------------
 7 files changed, 114 insertions(+), 118 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 0295b399c..bc9084e4d 100644
--- a/grunt.js
+++ b/grunt.js
@@ -361,6 +361,7 @@ grunt.initConfig({
 					menu_click: true,
 					menu_log: true,
 					module: true,
+					notEqual: true,
 					ok: true,
 					QUnit: true,
 					spinner_simulateKeyDownUp: true,
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index aca4c4694..93c7da114 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -99,7 +99,7 @@ asyncTest( "animateClass clears style properties when stopped", function() {
 	var test = $("div.animateClass"),
 		style = test[0].style,
 		orig = style.cssText;
-	
+
 	expect( 2 );
 
 	test.addClass( "testChangeBackground", duration );
@@ -113,17 +113,17 @@ asyncTest( "animateClass clears style properties when stopped", function() {
 asyncTest( "animateClass: css and class changes during animation are not lost (#7106)", function() {
 	var test = $( "div.ticket7106" );
 
-	// add a class and change a style property after starting an animated class
-	test.addClass( "animate", minDuration, animationComplete )
-		.addClass( "testClass" )
-		.height( 100 );
-
 	// ensure the class stays and that the css property stays
 	function animationComplete() {
 		ok( test.hasClass( "testClass" ), "class change during animateClass was not lost" );
 		equal( test.height(), 100, "css change during animateClass was not lost" );
 		start();
 	}
+
+	// add a class and change a style property after starting an animated class
+	test.addClass( "animate", minDuration, animationComplete )
+		.addClass( "testClass" )
+		.height( 100 );
 });
 
 
@@ -133,10 +133,9 @@ $.each( $.effects.effect, function( effect ) {
 	}
 	module( "effect."+effect );
 	asyncTest( "show/hide", function() {
-		var hidden = $( "div.hidden" );
 		expect( 8 );
-
-		var count = 0,
+		var hidden = $( "div.hidden" ),
+			count = 0,
 			test = 0;
 
 		function queueTest( fn ) {
diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js
index b9bb91c2e..df61d9e91 100644
--- a/tests/unit/effects/effects_scale.js
+++ b/tests/unit/effects/effects_scale.js
@@ -4,6 +4,11 @@ module( "effect.scale: Scale" );
 function run( position, v, h, vo, ho ) {
 	var desc = "End Position Correct: " + position + " (" + v + "," + h + ") - origin: (" + vo + "," + ho + ")";
 	asyncTest( desc, function() {
+		function complete() {
+			equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
+			equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
+			start();
+		}
 		var test = $( ".testScale" ),
 			css = {
 				position: position
@@ -21,22 +26,16 @@ function run( position, v, h, vo, ho ) {
 
 		css[ h ] = 33;
 		css[ v ] = 33;
-		target[ h ] = h === ho ? css[ h ] : ho == "center" ? css[ h ] - 35 : css[ h ] - 70;
-		target[ v ] = v === vo ? css[ v ] : vo == "middle" ? css[ v ] - 35 : css[ v ] - 70;
-		if ( relative && h == "right" ) {
+		target[ h ] = h === ho ? css[ h ] : ho === "center" ? css[ h ] - 35 : css[ h ] - 70;
+		target[ v ] = v === vo ? css[ v ] : vo === "middle" ? css[ v ] - 35 : css[ v ] - 70;
+		if ( relative && h === "right" ) {
 			target[ h ] += 70;
 		}
-		if ( relative && v == "bottom" ) {
+		if ( relative && v === "bottom" ) {
 			target[ v ] += 70;
 		}
 		test.css( css );
 		test.effect( effect );
-
-		function complete() {
-			equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
-			equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
-			start();
-		}
 	});
 }
 
diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index 02e3be3be..f2de7ef1a 100644
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -9,18 +9,19 @@ module("menu: core");
 
 test("accessibility", function () {
 	expect(5);
-	var menu = $('#menu1').menu();
-	var item0 = $("li:eq(0) a");
+	var item,
+		menu = $('#menu1').menu(),
+		item0 = $("li:eq(0) a");
 
 	ok( menu.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
 	equal( menu.attr("role"), "menu", "main role");
 	ok( !menu.attr("aria-activedescendant"), "aria attribute not yet active");
 
-	var item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
+	item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
 	menu.menu( "focus", $.Event(), item );
 	equal( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
 
-	var item = menu.find( "li:last" );
+	item = menu.find( "li:last" );
 	menu.menu( "focus", $.Event(), item );
 	equal( menu.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
 });
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index bee6fcfa6..c8203d37c 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -86,9 +86,6 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
 	var $menu = $( "#menu2" ).menu();
 
-	$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
-	setTimeout( menumouseleave1, 350 );
-
 	function menumouseleave1() {
 		equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
 		$menu.find( "li:nth-child(7) li:first" ).trigger( "mouseover" );
@@ -108,15 +105,15 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 		equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
 		start();
 	}
+
+	$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
+	setTimeout( menumouseleave1, 350 );
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
 	var $menu = $( "#menu5" ).menu( { menus: "div" } );
 
-	$menu.find( ":nth-child(7)" ).trigger( "mouseover" );
-	setTimeout( menumouseleave1, 350 );
-
 	function menumouseleave1() {
 		equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
 		$menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ).trigger( "mouseover" );
@@ -136,6 +133,10 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 		equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
 		start();
 	}
+
+	$menu.find( ":nth-child(7)" ).trigger( "mouseover" );
+	setTimeout( menumouseleave1, 350 );
+
 });
 
 
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index fbcac4b7f..5c86e7887 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -42,31 +42,32 @@ test( "my, at, of", function() {
 });
 
 test( "multiple elements", function() {
-	var elements = $( "#el1, #el2" );
-	var result = elements.position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parent",
-		collision: "none"
-	});
+	var elements = $( "#el1, #el2" ),
+		result = elements.position({
+			my: "left top",
+			at: "left bottom",
+			of: "#parent",
+			collision: "none"
+		}),
+		expected = { top: 10, left: 4 };
 
 	deepEqual( result, elements );
-	var expected = { top: 10, left: 4 };
 	elements.each(function() {
 		deepEqual( $( this ).offset(), expected );
 	});
 });
 
 test( "positions", function() {
-	var definitions = [];
-	var offsets = {
-		left: 0,
-		center: 3,
-		right: 6,
-		top: 0,
-		bottom: 6
-	};
-	var start = { left: 4, top: 4 };
+	var definitions = [],
+		offsets = {
+			left: 0,
+			center: 3,
+			right: 6,
+			top: 0,
+			bottom: 6
+		},
+		start = { left: 4, top: 4 },
+		el = $( "#el1" );
 	$.each( [ 0, 1 ], function( my ) {
 		$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
 			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
@@ -81,7 +82,6 @@ test( "positions", function() {
 			});
 		});
 	});
-	var el = $( "#el1" );
 	$.each( definitions, function( index, definition ) {
 		el.position({
 			my: definition.my,
@@ -445,12 +445,12 @@ test( "addClass: flipped left", function() {
 
 	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
 
-	elem.position( {
+	elem.position({
 		my: "right center",
 		of: window,
 		collision: "flip",
 		at: "left center"
-	})
+	});
 
 	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Removed ui-flipped-left class' );
 });
diff --git a/tests/unit/position/position_core_within.js b/tests/unit/position/position_core_within.js
index 9dc91238f..187408c61 100644
--- a/tests/unit/position/position_core_within.js
+++ b/tests/unit/position/position_core_within.js
@@ -65,32 +65,33 @@ test( "my, at, of", function() {
 });
 
 test( "multiple elements", function() {
-	var elements = $( "#el1, #el2" );
-	var result = elements.position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parent",
-		collision: "none",
-		within: $("#within-container")
-	});
+	var elements = $( "#el1, #el2" ),
+		result = elements.position({
+			my: "left top",
+			at: "left bottom",
+			of: "#parent",
+			collision: "none",
+			within: $("#within-container")
+		}),
+		expected = { top: addTop + 10, left: addLeft + 4 };
 
 	deepEqual( result, elements );
-	var expected = { top: addTop + 10, left: addLeft + 4 };
 	elements.each(function() {
 		deepEqual( $( this ).addOffsets(), expected );
 	});
 });
 
 test( "positions", function() {
-	var definitions = [];
-	var offsets = {
-		left: 0,
-		center: 3,
-		right: 6,
-		top: 0,
-		bottom: 6
-	};
-	var start = { left: 4, top: 4 };
+	var definitions = [],
+		offsets = {
+			left: 0,
+			center: 3,
+			right: 6,
+			top: 0,
+			bottom: 6
+		},
+		start = { left: 4, top: 4 },
+		el = $( "#el1" );
 	$.each( [ 0, 1 ], function( my ) {
 		$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
 			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
@@ -105,7 +106,6 @@ test( "positions", function() {
 			});
 		});
 	});
-	var el = $( "#el1" );
 	$.each( definitions, function( index, definition ) {
 		el.position({
 			my: definition.my,
@@ -120,7 +120,8 @@ test( "positions", function() {
 });
 
 test( "of", function() {
-	var within = $("#within-container");
+	var event,
+		within = $( "#within-container" );
 
 	$( "#elx" ).position({
 		my: "left top",
@@ -149,7 +150,7 @@ test( "of", function() {
 	});
 	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 40, left: addLeft + 40 }, "DOM element" );
 
-	var event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
+	event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
 	$( "#elx" ).position({
 		my: "left top",
 		at: "left top",
@@ -219,9 +220,8 @@ test( "within:offsets", function() {
 test( "using", function() {
 	expect( 6 );
 
-	var within = $("#within-container");
-
-	var count = 0,
+	var within = $( "#within-container" ),
+		count = 0,
 		elems = $( "#el1, #el2" ),
 		expectedPosition = { top: addTop + 40, left: addLeft + 40 },
 		originalPosition = elems.position({
@@ -252,14 +252,13 @@ test( "using", function() {
 });
 
 function collisionTest( config, result, msg ) {
-	var within = $("#within-container");
-
-	var elem = $( "#elx" ).position( $.extend({
-		my: "left top",
-		at: "right bottom",
-		of: "#parentx",
-		within: within
-	}, config ) );
+	var within = $( "#within-container" ),
+		elem = $( "#elx" ).position( $.extend({
+			my: "left top",
+			at: "right bottom",
+			of: "#parentx",
+			within: within
+		}, config ) );
 
 	deepEqual( elem.addOffsets(), result, msg );
 }
@@ -448,39 +447,37 @@ test( "collision: flip, with margin", function() {
 });
 
 test( "addClass: flipped left", function() {
-	var within = $("#within-container");
-
-	var elem = $( "#elx" ).position( {
-		my: "left center",
-		of: within[0],
-		within: within,
-		collision: "flip",
-		at: "right center"
-	});
+	var within = $("#within-container"),
+		elem = $( "#elx" ).position( {
+			my: "left center",
+			of: within[0],
+			within: within,
+			collision: "flip",
+			at: "right center"
+		});
 
 	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
 
-	elem.position( {
+	elem.position({
 		my: "right center",
 		of: within[0],
 		within: within,
 		collision: "flip",
 		at: "left center"
-	})
+	});
 
 	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Removed ui-flipped-left class' );
 });
 
 test( "addClass: flipped top", function() {
-	var within = $("#within-container");
-
-	var elem = $( "#elx" ).position( {
-		my: "left top",
-		of: within[0],
-		within: within,
-		collision: "flip",
-		at: "right bottom"
-	});
+	var within = $("#within-container"),
+		elem = $( "#elx" ).position( {
+			my: "left top",
+			of: within[0],
+			within: within,
+			collision: "flip",
+			at: "right bottom"
+		});
 
 	deepEqual( elem.hasClass( 'ui-flipped-top' ), false, 'Has ui-flipped-top class' );
 
@@ -496,15 +493,14 @@ test( "addClass: flipped top", function() {
 });
 
 test( "addClass: flipped right", function() {
-	var within = $("#within-container");
-
-	var elem = $( "#elx" ).position( {
-		my: "right center",
-		of: within[0],
-		within: within,
-		collision: "flip",
-		at: "left center"
-	});
+	var within = $("#within-container"),
+		elem = $( "#elx" ).position( {
+			my: "right center",
+			of: within[0],
+			within: within,
+			collision: "flip",
+			at: "left center"
+		});
 
 	deepEqual( elem.hasClass( 'ui-flipped-right' ), false, 'Has ui-flipped-right class' );
 
@@ -521,14 +517,13 @@ test( "addClass: flipped right", function() {
 });
 
 test( "addClass: flipped bottom", function() {
-	var within = $("#within-container");
-
-	var elem = $( "#elx" ).position( {
-		my: "left bottom",
-		of: window,
-		collision: "flip",
-		at: "right top"
-	});
+	var within = $("#within-container"),
+		elem = $( "#elx" ).position( {
+			my: "left bottom",
+			of: window,
+			collision: "flip",
+			at: "right top"
+		});
 
 	deepEqual( elem.hasClass( 'ui-flipped-bottom' ), false, 'Has ui-flipped-bottom class' );
 
-- 
cgit v1.2.3


From 0a5a9090f827cd186ac486344327bcbb3901fd34 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 10:27:06 -0400
Subject: Tests: Lint.

---
 grunt.js                                   | 21 ++++++-
 tests/unit/dialog/dialog_core.js           |  8 +--
 tests/unit/dialog/dialog_events.js         | 10 ++--
 tests/unit/dialog/dialog_methods.js        |  9 ++-
 tests/unit/dialog/dialog_options.js        | 94 +++++++++++++++---------------
 tests/unit/dialog/dialog_tickets.js        | 21 +++----
 tests/unit/draggable/draggable_core.js     | 18 +++---
 tests/unit/draggable/draggable_options.js  | 79 +++++++++++--------------
 tests/unit/droppable/droppable_core.js     | 10 ++--
 tests/unit/droppable/droppable_defaults.js | 28 ++++-----
 tests/unit/droppable/droppable_options.js  |  4 --
 11 files changed, 155 insertions(+), 147 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index bc9084e4d..7632a41ae 100644
--- a/grunt.js
+++ b/grunt.js
@@ -350,27 +350,46 @@ grunt.initConfig({
 					accordion_state: true,
 					asyncTest: true,
 					commonWidgetTests: true,
+					container: true,
 					deepEqual: true,
+					d1: true,
+					d2: true,
 					dlg: true,
 					domEqual: true,
 					drag: true,
+					dragged: true,
 					el: true,
 					equal: true,
 					expect: true,
 					Globalize: true,
+					heightAfter: true,
+					isNotOpen: true,
+					isOpen: true,
 					menu_click: true,
 					menu_log: true,
+					modal: true,
 					module: true,
+					moved: true,
 					notEqual: true,
+					offsetAfter: true,
+					offsetBefore: true,
 					ok: true,
 					QUnit: true,
+					restoreScroll: true,
+					shouldBeDroppable: true,
+					shouldmove: true,
+					shouldNotBeDroppable: true,
+					shouldnotmove: true,
+					shouldnotresize: true,
+					shouldresize: true,
 					spinner_simulateKeyDownUp: true,
 					start: true,
 					strictEqual: true,
 					stop: true,
 					tabs_state: true,
 					tabs_disabled: true,
-					test: true
+					test: true,
+					widthAfter: true
 				}
 			}
 		};
diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/dialog_core.js
index 4a671968e..5d7beb99b 100644
--- a/tests/unit/dialog/dialog_core.js
+++ b/tests/unit/dialog/dialog_core.js
@@ -40,8 +40,8 @@ function drag(handle, dx, dy) {
 
 function moved(dx, dy, msg) {
 	msg = msg ? msg + "." : "";
-	var actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) };
-	var expected = { left: Math.round(offsetBefore.left + dx), top: Math.round(offsetBefore.top + dy) };
+	var actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) },
+		expected = { left: Math.round(offsetBefore.left + dx), top: Math.round(offsetBefore.top + dy) };
 	deepEqual(actual, expected, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ' + msg);
 }
 
@@ -59,8 +59,8 @@ function shouldnotmove(why) {
 
 function resized(dw, dh, msg) {
 	msg = msg ? msg + "." : "";
-	var actual = { width: widthAfter, height: heightAfter };
-	var expected = { width: widthBefore + dw, height: heightBefore + dh };
+	var actual = { width: widthAfter, height: heightAfter },
+		expected = { width: widthBefore + dw, height: heightBefore + dh };
 	deepEqual(actual, expected, 'resized[' + dragged.dx + ', ' + dragged.dy + '] ' + msg);
 }
 
diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
index 4b769bafc..85afa5a3b 100644
--- a/tests/unit/dialog/dialog_events.js
+++ b/tests/unit/dialog/dialog_events.js
@@ -63,7 +63,8 @@ test("dragStart", function() {
 
 test("drag", function() {
 	expect(9);
-	var hasDragged = false;
+	var handle,
+		hasDragged = false;
 
 	el = $('<div></div>').dialog({
 		drag: function(ev, ui) {
@@ -83,7 +84,7 @@ test("drag", function() {
 		ok(ui.position !== undefined, "ui.position in callback");
 		ok(ui.offset !== undefined, "ui.offset in callback");
 	});
-	var handle = $(".ui-dialog-titlebar", dlg());
+	handle = $(".ui-dialog-titlebar", dlg());
 	drag(handle, 50, 50);
 	el.remove();
 });
@@ -138,7 +139,8 @@ test("resizeStart", function() {
 
 test("resize", function() {
 	expect(13);
-	var hasResized = false;
+	var handle,
+		hasResized = false;
 
 	el = $('<div></div>').dialog({
 		resize: function(ev, ui) {
@@ -162,7 +164,7 @@ test("resize", function() {
 		ok(ui.position !== undefined, "ui.position in callback");
 		ok(ui.size !== undefined, "ui.size in callback");
 	});
-	var handle = $(".ui-resizable-se", dlg());
+	handle = $(".ui-resizable-se", dlg());
 	drag(handle, 50, 50);
 	el.remove();
 });
diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js
index 645baa9f5..1f84cd6b5 100644
--- a/tests/unit/dialog/dialog_methods.js
+++ b/tests/unit/dialog/dialog_methods.js
@@ -98,14 +98,17 @@ test("isOpen", function() {
 });
 
 test("moveToTop", function() {
-	var expected = $('<div></div>').dialog(),
+	var d1, d2, dlg1, dlg2,
+		expected = $('<div></div>').dialog(),
 		actual = expected.dialog('moveToTop');
 	equal(actual, expected, 'moveToTop is chainable');
 
-	var d1 = $('<div></div>').dialog(), dlg1 = d1.parents('.ui-dialog');
+	d1 = $('<div></div>').dialog();
+	dlg1 = d1.parents('.ui-dialog');
 	d1.dialog('close');
 	d1.dialog('open');
-	var d2 = $('<div></div>').dialog(), dlg2 = d2.parents('.ui-dialog');
+	d2 = $('<div></div>').dialog();
+	dlg2 = d2.parents('.ui-dialog');
 	d2.dialog('close');
 	d2.dialog('open');
 	ok(dlg1.css('zIndex') < dlg2.css('zIndex'), 'dialog 1 under dialog 2 before moveToTop method called');
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 10443892b..c071c1b09 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -20,7 +20,8 @@ test("autoOpen", function() {
 test("buttons", function() {
 	expect(21);
 
-	var buttons = {
+	var btn, i, newButtons,
+		buttons = {
 		"Ok": function(ev, ui) {
 			ok(true, "button click fires callback");
 			equal(this, el[0], "context of callback");
@@ -34,10 +35,10 @@ test("buttons", function() {
 	};
 
 	el = $('<div></div>').dialog({ buttons: buttons });
-	var btn = $("button", dlg());
+	btn = $("button", dlg());
 	equal(btn.length, 2, "number of buttons");
 
-	var i = 0;
+	i = 0;
 	$.each(buttons, function(key, val) {
 		equal(btn.eq(i).text(), key, "text of button " + (i+1));
 		i++;
@@ -48,7 +49,7 @@ test("buttons", function() {
 
 	btn.trigger("click");
 
-	var newButtons = {
+	newButtons = {
 		"Close": function(ev, ui) {
 			ok(true, "button click fires callback");
 			equal(this, el[0], "context of callback");
@@ -275,54 +276,54 @@ test("minWidth", function() {
 });
 
 test("position, default center on window", function() {
-	var el = $('<div></div>').dialog();
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+	var el = $('<div></div>').dialog(),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 	deepEqual(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft());
 	deepEqual(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop());
 	el.remove();
 });
 
 test("position, top on window", function() {
-	var el = $('<div></div>').dialog({ position: "top" });
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+	var el = $('<div></div>').dialog({ position: "top" }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 	deepEqual(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft());
 	deepEqual(offset.top, $(window).scrollTop());
 	el.remove();
 });
 
 test("position, left on window", function() {
-	var el = $('<div></div>').dialog({ position: "left" });
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+	var el = $('<div></div>').dialog({ position: "left" }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 	deepEqual(offset.left, 0);
 	deepEqual(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop());
 	el.remove();
 });
 
 test("position, right bottom on window", function() {
-	var el = $('<div></div>').dialog({ position: "right bottom" });
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+	var el = $('<div></div>').dialog({ position: "right bottom" }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 	deepEqual(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft());
 	deepEqual(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop());
 	el.remove();
 });
 
 test("position, right bottom on window w/array", function() {
-	var el = $('<div></div>').dialog({ position: ["right", "bottom"] });
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+	var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 	deepEqual(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft());
 	deepEqual(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop());
 	el.remove();
 });
 
 test("position, offset from top left w/array", function() {
-	var el = $('<div></div>').dialog({ position: [10, 10] });
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+	var el = $('<div></div>').dialog({ position: [10, 10] }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 	deepEqual(offset.left, 10 + $(window).scrollLeft());
 	deepEqual(offset.top, 10 + $(window).scrollTop());
 	el.remove();
@@ -330,14 +331,13 @@ test("position, offset from top left w/array", function() {
 
 test("position, right bottom at right bottom via ui.position args", function() {
 	var el = $('<div></div>').dialog({
-		position: {
-			my: "right bottom",
-			at: "right bottom"
-		}
-	});
-
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+			position: {
+				my: "right bottom",
+				at: "right bottom"
+			}
+		}),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 
 	deepEqual(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft());
 	deepEqual(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop());
@@ -346,23 +346,23 @@ test("position, right bottom at right bottom via ui.position args", function() {
 
 test("position, at another element", function() {
 	var parent = $('<div></div>').css({
-		position: 'absolute',
-		top: 400,
-		left: 600,
-		height: 10,
-		width: 10
-	}).appendTo('body');
-
-	var el = $('<div></div>').dialog({
-		position: {
-			my: "left top",
-			at: "left top",
-			of: parent
-		}
-	});
+			position: 'absolute',
+			top: 400,
+			left: 600,
+			height: 10,
+			width: 10
+		}).appendTo('body'),
+
+		el = $('<div></div>').dialog({
+			position: {
+				my: "left top",
+				at: "left top",
+				of: parent
+			}
+		}),
 
-	var dialog = el.dialog('widget');
-	var offset = dialog.offset();
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
 
 	deepEqual(offset.left, 600);
 	deepEqual(offset.top, 400);
@@ -373,7 +373,7 @@ test("position, at another element", function() {
 			of: parent
 	});
 
-	var offset = dialog.offset();
+	offset = dialog.offset();
 
 	deepEqual(offset.left, 610);
 	deepEqual(offset.top, 410);
diff --git a/tests/unit/dialog/dialog_tickets.js b/tests/unit/dialog/dialog_tickets.js
index bd9056153..a169bd1a5 100644
--- a/tests/unit/dialog/dialog_tickets.js
+++ b/tests/unit/dialog/dialog_tickets.js
@@ -12,12 +12,6 @@ asyncTest( "#3123: Prevent tabbing out of modal dialogs", function() {
 		inputs = el.find( "input" ),
 		widget = el.dialog( "widget" );
 
-	inputs.eq( 1 ).focus();
-	equal( document.activeElement, inputs[1], "Focus set on second input" );
-	inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
-
-	setTimeout( checkTab, 2 );
-
 	function checkTab() {
 		ok( $.contains( widget, document.activeElement ), "Tab key event moved focus within the modal" );
 
@@ -32,14 +26,21 @@ asyncTest( "#3123: Prevent tabbing out of modal dialogs", function() {
 		el.remove();
 		start();
 	}
+
+	inputs.eq( 1 ).focus();
+	equal( document.activeElement, inputs[1], "Focus set on second input" );
+	inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
+
+	setTimeout( checkTab, 2 );
 });
 
 test("#4826: setting resizable false toggles resizable on dialog", function() {
 	expect(6);
+	var i;
 
 	el = $('<div></div>').dialog({ resizable: false });
 	shouldnotresize("[default]");
-	for (var i=0; i<2; i++) {
+	for (i=0; i<2; i++) {
 		el.dialog('close').dialog('open');
 		shouldnotresize('initialized with resizable false toggle ('+ (i+1) +')');
 	}
@@ -47,7 +48,7 @@ test("#4826: setting resizable false toggles resizable on dialog", function() {
 
 	el = $('<div></div>').dialog({ resizable: true });
 	shouldresize("[default]");
-	for (var i=0; i<2; i++) {
+	for (i=0; i<2; i++) {
 		el.dialog('close').dialog('option', 'resizable', false).dialog('open');
 		shouldnotresize('set option resizable false toggle ('+ (i+1) +')');
 	}
@@ -108,7 +109,7 @@ test("#6137: dialog('open') causes form elements to reset on IE7", function() {
 test("#6645: Missing element not found check in overlay", function(){
     expect(2);
     d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
-    d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove()}});
+    d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
     equal($.ui.dialog.overlay.instances.length, 2, 'two overlays created');
     d2.dialog('close');
     equal($.ui.dialog.overlay.instances.length, 1, 'one overlay remains after closing the 2nd overlay');
@@ -119,7 +120,7 @@ test("#6966: Escape key closes all dialogs, not the top one", function(){
 	expect(8);
     // test with close function removing dialog
     d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
-    d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove()}});
+    d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
     ok(d1.dialog("isOpen"), 'first dialog is open');
     ok(d2.dialog("isOpen"), 'second dialog is open');
     d2.simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js
index ba5bc4c66..9193881ad 100644
--- a/tests/unit/draggable/draggable_core.js
+++ b/tests/unit/draggable/draggable_core.js
@@ -4,7 +4,7 @@
 
 var el, offsetBefore, offsetAfter, dragged;
 
-var drag = function(handle, dx, dy) {
+function drag(handle, dx, dy) {
 	var element = el.data("draggable").element;
 	offsetBefore = el.offset();
 	$(handle).simulate("drag", {
@@ -15,10 +15,10 @@ var drag = function(handle, dx, dy) {
 	offsetAfter = el.offset();
 }
 
-var moved = function (dx, dy, msg) {
+function moved(dx, dy, msg) {
 	msg = msg ? msg + "." : "";
-	var actual = { left: offsetAfter.left, top: offsetAfter.top };
-	var expected = { left: offsetBefore.left + dx, top: offsetBefore.top + dy };
+	var actual = { left: offsetAfter.left, top: offsetAfter.top },
+		expected = { left: offsetBefore.left + dx, top: offsetBefore.top + dy };
 	deepEqual(actual, expected, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ' + msg);
 }
 
@@ -35,15 +35,15 @@ function restoreScroll(what) {
 module("draggable");
 
 test("element types", function() {
-	var typeNames = ('p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form'
-		+ ',table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr'
-		+ ',acronym,code,samp,kbd,var,img,object,hr'
-		+ ',input,button,label,select,iframe').split(',');
+	var typeNames = ('p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form' +
+		',table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr' +
+		',acronym,code,samp,kbd,var,img,object,hr' +
+		',input,button,label,select,iframe').split(',');
 
 	$.each(typeNames, function(i) {
 		var typeName = typeNames[i];
 		el = $(document.createElement(typeName)).appendTo('body');
-		(typeName == 'table' && el.append("<tr><td>content</td></tr>"));
+		(typeName === 'table' && el.append("<tr><td>content</td></tr>"));
 		el.draggable({ cancel: '' });
 		drag(el, 50, 50);
 		moved(50, 50, "&lt;" + typeName + "&gt;");
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
index d5f85feab..464e025dd 100644
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/draggable_options.js
@@ -17,15 +17,16 @@ function setScroll(what) {
 	}
 }
 
-var border = function(el, side) { return parseInt(el.css('border-' + side + '-width')); }
-
-var margin = function(el, side) { return parseInt(el.css('margin-' + side)); }
+function border(el, side) {
+	return parseInt(el.css('border-' + side + '-width'), 10);
+}
+function margin(el, side) {
+	return parseInt(el.css('margin-' + side), 10);
+}
 
 module("draggable: options");
 
 test("{ addClasses: true }, default", function() {
-	equal(draggable_defaults.addClasses, true);
-
 	el = $("<div></div>").draggable({ addClasses: true });
 	ok(el.is(".ui-draggable"), "'ui-draggable' class added");
 
@@ -40,8 +41,6 @@ test("{ addClasses: false }", function() {
 });
 
 test("{ appendTo: 'parent' }, default", function() {
-	equal(draggable_defaults.appendTo, "parent");
-
 	el = $("#draggable2").draggable({ appendTo: 'parent' });
 	drag(el, 50, 50);
 	moved(50, 50);
@@ -73,8 +72,6 @@ test("{ appendTo: Selector }", function() {
 });
 
 test("{ axis: false }, default", function() {
-	equal(draggable_defaults.axis, false);
-
 	el = $("#draggable2").draggable({ axis: false });
 	drag(el, 50, 50);
 	moved(50, 50);
@@ -106,12 +103,10 @@ test("{ axis: ? }, unexpected", function() {
 		drag(el, 50, 50);
 		moved(50, 50, "axis: " + key);
 		el.draggable("destroy");
-	})
+	});
 });
 
 test("{ cancel: ':input,option' }, default", function() {
-	equal(draggable_defaults.cancel, ":input,option");
-
 	$('<div id="draggable-option-cancel-default"><input type="text"></div>').appendTo('#main');
 
 	el = $("#draggable-option-cancel-default").draggable({ cancel: ":input,option" });
@@ -155,12 +150,10 @@ test("{ cancel: ? }, unexpected", function() {
 		var expected = [50, 50];
 		moved(expected[0], expected[1], "cancel: " + key);
 		el.draggable("destroy");
-	})
+	});
 });
 
 test("{ containment: false }, default", function() {
-	equal(draggable_defaults.containment, false);
-
 	ok(false, 'missing test - untested code is broken code');
 });
 
@@ -170,23 +163,25 @@ test("{ containment: Element }", function() {
 
 test("{ containment: 'parent' }, relative", function() {
 	el = $("#draggable1").draggable({ containment: 'parent' });
-	var p = el.parent(), po = p.offset();
+	var p = el.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + border(p, 'left') + margin(el, 'left'),
+			top: po.top + border(p, 'top') + margin(el, 'top')
+		};
 	drag(el, -100, -100);
-	var expected = {
-		left: po.left + border(p, 'left') + margin(el, 'left'),
-		top: po.top + border(p, 'top') + margin(el, 'top')
-	}
 	deepEqual(offsetAfter, expected, 'compare offset to parent');
 });
 
 test("{ containment: 'parent' }, absolute", function() {
 	el = $("#draggable2").draggable({ containment: 'parent' });
-	var p = el.parent(), po = p.offset();
+	var p = el.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + border(p, 'left') + margin(el, 'left'),
+			top: po.top + border(p, 'top') + margin(el, 'top')
+		};
 	drag(el, -100, -100);
-	var expected = {
-		left: po.left + border(p, 'left') + margin(el, 'left'),
-		top: po.top + border(p, 'top') + margin(el, 'top')
-	}
 	deepEqual(offsetAfter, expected, 'compare offset to parent');
 });
 
@@ -207,11 +202,9 @@ test("{ containment: [x1, y1, x2, y2] }", function() {
 });
 
 test("{ cursor: 'auto' }, default", function() {
-	equal(draggable_defaults.cursor, 'auto');
-
 	function getCursor() { return $("#draggable2").css("cursor"); }
 
-	expect(3);
+	expect(2);
 
 	var expected = "auto", actual, before, after;
 
@@ -256,8 +249,6 @@ test("{ cursor: 'move' }", function() {
 });
 
 test("{ cursorAt: false}, default", function() {
-	equal(draggable_defaults.cursorAt, false);
-
 	ok(false, 'missing test - untested code is broken code');
 });
 
@@ -611,8 +602,8 @@ test("{ helper: 'original' }, fixed, with scroll offset on root and parent", fun
 
 test("{ helper: 'clone' }, absolute", function() {
 
-	var helperOffset = null;
-	var origOffset = $("#draggable1").offset();
+	var helperOffset = null,
+		origOffset = $("#draggable1").offset();
 
 	el = $("#draggable1").draggable({ helper: "clone", drag: function(event, ui) {
 		helperOffset = ui.helper.offset();
@@ -626,8 +617,8 @@ test("{ helper: 'clone' }, absolute", function() {
 test("{ helper: 'clone' }, absolute with scroll offset on parent", function() {
 
 	setScroll();
-	var helperOffset = null;
-	var origOffset = null;
+	var helperOffset = null,
+	origOffset = null;
 
 	el = $("#draggable1").draggable({ helper: "clone", drag: function(event, ui) {
 		helperOffset = ui.helper.offset();
@@ -655,8 +646,8 @@ test("{ helper: 'clone' }, absolute with scroll offset on parent", function() {
 test("{ helper: 'clone' }, absolute with scroll offset on root", function() {
 
 	setScroll('root');
-	var helperOffset = null;
-	var origOffset = null;
+	var helperOffset = null,
+		origOffset = null;
 
 	el = $("#draggable1").draggable({ helper: "clone", drag: function(event, ui) {
 		helperOffset = ui.helper.offset();
@@ -685,25 +676,25 @@ test("{ helper: 'clone' }, absolute with scroll offset on root and parent", func
 
 	setScroll('root');
 	setScroll();
-	var helperOffset = null;
-	var origOffset = null;
+	var helperOffset = null,
+		origOffset = null;
 
 	el = $("#draggable1").draggable({ helper: "clone", drag: function(event, ui) {
 		helperOffset = ui.helper.offset();
 	} });
 
 	$("#main").css('position', 'relative');
-	origOffset = $("#draggable1").offset()
+	origOffset = $("#draggable1").offset();
 	drag(el, 1, 1);
 	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ');
 
 	$("#main").css('position', 'static');
-	origOffset = $("#draggable1").offset()
+	origOffset = $("#draggable1").offset();
 	drag(el, 1, 1);
 	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ');
 
 	$("#main").css('position', 'absolute');
-	origOffset = $("#draggable1").offset()
+	origOffset = $("#draggable1").offset();
 	drag(el, 1, 1);
 	deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ');
 
@@ -734,9 +725,9 @@ test("{ zIndex: 10 }", function() {
 
 	expect(1);
 
-	var expected = 10, actual;
-
-	var zIndex = null;
+	var actual,
+		expected = 10,
+		zIndex = null;
 	el = $("#draggable2").draggable({
 		zIndex: expected,
 		start: function(event, ui) {
diff --git a/tests/unit/droppable/droppable_core.js b/tests/unit/droppable/droppable_core.js
index 4d82017b9..3f709d25d 100644
--- a/tests/unit/droppable/droppable_core.js
+++ b/tests/unit/droppable/droppable_core.js
@@ -17,15 +17,15 @@ function shouldNotBeDroppable() {
 module("droppable: core");
 
 test("element types", function() {
-	var typeNames = ('p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form'
-		+ ',table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr'
-		+ ',acronym,code,samp,kbd,var,img,object,hr'
-		+ ',input,button,label,select,iframe').split(',');
+	var typeNames = ('p,h1,h2,h3,h4,h5,h6,blockquote,ol,ul,dl,div,form' +
+		',table,fieldset,address,ins,del,em,strong,q,cite,dfn,abbr' +
+		',acronym,code,samp,kbd,var,img,object,hr' +
+		',input,button,label,select,iframe').split(',');
 
 	$.each(typeNames, function(i) {
 		var typeName = typeNames[i];
 		el = $(document.createElement(typeName)).appendTo('body');
-		(typeName == 'table' && el.append("<tr><td>content</td></tr>"));
+		(typeName === 'table' && el.append("<tr><td>content</td></tr>"));
 		el.droppable();
 		shouldBeDroppable();
 		el.droppable("destroy");
diff --git a/tests/unit/droppable/droppable_defaults.js b/tests/unit/droppable/droppable_defaults.js
index 7584f5ec8..5a1a4198c 100644
--- a/tests/unit/droppable/droppable_defaults.js
+++ b/tests/unit/droppable/droppable_defaults.js
@@ -1,16 +1,12 @@
-/*
- * droppable_defaults.js
- */
-
-var droppable_defaults = {
-	accept: '*',
-	activeClass: false,
-	addClasses: true,
-	disabled: false,
-	greedy: false,
-	hoverClass: false,
-	scope: "default",
-	tolerance: "intersect"
-};
-
-commonWidgetTests('droppable', { defaults: droppable_defaults });
+commonWidgetTests( "droppable", {
+	defaults: {
+		accept: "*",
+		activeClass: false,
+		addClasses: true,
+		disabled: false,
+		greedy: false,
+		hoverClass: false,
+		scope: "default",
+		tolerance: "intersect"
+	}
+});
diff --git a/tests/unit/droppable/droppable_options.js b/tests/unit/droppable/droppable_options.js
index 4df2d9ecb..19295778b 100644
--- a/tests/unit/droppable/droppable_options.js
+++ b/tests/unit/droppable/droppable_options.js
@@ -6,8 +6,6 @@
 module("droppable: options");
 
 test("{ accept '*' }, default ", function() {
-	equal(droppable_defaults.accept, '*');
-
 	ok(false, 'missing test - untested code is broken code');
 });
 
@@ -24,8 +22,6 @@ test("activeClass", function() {
 });
 
 test("{ addClasses: true }, default", function() {
-	equal(droppable_defaults.addClasses, true);
-
 	el = $("<div></div>").droppable({ addClasses: true });
 	ok(el.is(".ui-droppable"), "'ui-droppable' class added");
 	el.droppable("destroy");
-- 
cgit v1.2.3


From af1b4d859d9563e43896d76086e1e9ebbb3ab74b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 10:50:09 -0400
Subject: Tests: Lint.

---
 grunt.js                                       |  2 +
 tests/unit/accordion/accordion_core.js         | 14 +++---
 tests/unit/accordion/accordion_deprecated.js   | 28 +++++------
 tests/unit/accordion/accordion_events.js       | 20 ++++----
 tests/unit/accordion/accordion_options.js      | 66 +++++++++++++-------------
 tests/unit/accordion/accordion_test_helpers.js |  4 +-
 tests/unit/autocomplete/autocomplete_events.js |  2 +-
 tests/unit/button/button_core.js               | 11 +++--
 tests/unit/button/button_methods.js            |  4 +-
 9 files changed, 77 insertions(+), 74 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 7632a41ae..48be599b7 100644
--- a/grunt.js
+++ b/grunt.js
@@ -347,6 +347,8 @@ grunt.initConfig({
 				}, defaults ),
 				// TODO: don't create so many globals in tests
 				globals: {
+					accordion_equalHeights: true,
+					accordion_setupTeardown: true,
 					accordion_state: true,
 					asyncTest: true,
 					commonWidgetTests: true,
diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 92d79c121..b08a5caea 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -27,9 +27,9 @@ test( "handle click on header-descendant", function() {
 test( "accessibility", function () {
 	expect( 37 );
 	var element = $( "#list1" ).accordion({
-		active: 1
-	});
-	var headers = element.find( ".ui-accordion-header" );
+			active: 1
+		}),
+		headers = element.find( ".ui-accordion-header" );
 
 	equal( element.attr( "role" ), "tablist", "element role" );
 	headers.each(function( i ) {
@@ -85,22 +85,22 @@ asyncTest( "keybaord support", function() {
 		ok( headers.eq( 2 ).is( ".ui-state-focus" ), "RIGHT moves focus to next header" );
 		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } );
 		ok( headers.eq( 0 ).is( ".ui-state-focus" ), "DOWN wraps focus to first header" );
-	
+
 		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } );
 		ok( headers.eq( 2 ).is( ".ui-state-focus" ), "UP wraps focus to last header" );
 		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } );
 		ok( headers.eq( 1 ).is( ".ui-state-focus" ), "LEFT moves focus to previous header" );
-	
+
 		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } );
 		ok( headers.eq( 0 ).is( ".ui-state-focus" ), "HOME moves focus to first header" );
 		headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } );
 		ok( headers.eq( 2 ).is( ".ui-state-focus" ), "END moves focus to last header" );
-	
+
 		headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } );
 		equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" );
 		headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } );
 		equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" );
-	
+
 		anchor.simulate( "focus" );
 		setTimeout(function() {
 			ok( !headers.eq( 1 ).is( ".ui-state-focus" ), "header loses focus when focusing inside the panel" );
diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
index eec034e18..47180e785 100644
--- a/tests/unit/accordion/accordion_deprecated.js
+++ b/tests/unit/accordion/accordion_deprecated.js
@@ -110,8 +110,8 @@ test( "{ autoHeight: true }, default", function() {
 
 test( "{ autoHeight: false }", function() {
 	expect( 3 );
-	var element = $( "#navigation" ).accordion({ autoHeight: false });
-	var sizes = [];
+	var element = $( "#navigation" ).accordion({ autoHeight: false }),
+		sizes = [];
 	element.find( ".ui-accordion-content" ).each(function() {
 		sizes.push( $(this).height() );
 	});
@@ -220,7 +220,7 @@ test( "{ navigation: true, navigationFilter: header }", function() {
 	var element = $( "#navigation" ).accordion({
 		navigation: true,
 		navigationFilter: function() {
-			return /\?p=1\.1\.3$/.test( this.href );
+			return (/\?p=1\.1\.3$/).test( this.href );
 		}
 	});
 	equal( element.accordion( "option", "active" ), 2 );
@@ -232,7 +232,7 @@ test( "{ navigation: true, navigationFilter: content }", function() {
 	var element = $( "#navigation" ).accordion({
 		navigation: true,
 		navigationFilter: function() {
-			return /\?p=1\.1\.3\.2$/.test( this.href );
+			return (/\?p=1\.1\.3\.2$/).test( this.href );
 		}
 	});
 	equal( element.accordion( "option", "active" ), 2 );
@@ -248,11 +248,11 @@ module( "accordion (deprecated) - changestart/change events", accordion_setupTea
 test( "changestart", function() {
 	expect( 26 );
 	var element = $( "#list1" ).accordion({
-		active: false,
-		collapsible: true
-	});
-	var headers = element.find( ".ui-accordion-header" );
-	var content = element.find( ".ui-accordion-content" );
+			active: false,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" ),
+		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionchangestart", function( event, ui ) {
 		equal( ui.oldHeader.size(), 0 );
@@ -296,11 +296,11 @@ test( "changestart", function() {
 test( "change", function() {
 	expect( 20 );
 	var element = $( "#list1" ).accordion({
-		active: false,
-		collapsible: true
-	});
-	var headers = element.find( ".ui-accordion-header" );
-	var content = element.find( ".ui-accordion-content" );
+			active: false,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" ),
+		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionchange", function( event, ui ) {
 		equal( ui.oldHeader.size(), 0 );
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index dbb3e37df..7e3d1f8d0 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -44,11 +44,11 @@ test( "create", function() {
 test( "beforeActivate", function() {
 	expect( 38 );
 	var element = $( "#list1" ).accordion({
-		active: false,
-		collapsible: true
-	});
-	var headers = element.find( ".ui-accordion-header" );
-	var content = element.find( ".ui-accordion-content" );
+			active: false,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" ),
+		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
@@ -109,11 +109,11 @@ test( "beforeActivate", function() {
 test( "activate", function() {
 	expect( 21 );
 	var element = $( "#list1" ).accordion({
-		active: false,
-		collapsible: true
-	});
-	var headers = element.find( ".ui-accordion-header" );
-	var content = element.find( ".ui-accordion-content" );
+			active: false,
+			collapsible: true
+		}),
+		headers = element.find( ".ui-accordion-header" ),
+		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionactivate", function( event, ui ) {
 		equal( ui.oldHeader.size(), 0 );
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index 2b7176394..a29c7f07d 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -80,7 +80,7 @@ test( "{ animate: false }", function() {
 	var element = $( "#list1" ).accordion({
 			animate: false
 		}),
-		panels = element.find( ".ui-accordion-content" );
+		panels = element.find( ".ui-accordion-content" ),
 		animate = $.fn.animate;
 	$.fn.animate = function() {
 		ok( false, ".animate() called" );
@@ -98,7 +98,7 @@ asyncTest( "{ animate: Number }", function() {
 	var element = $( "#list1" ).accordion({
 			animate: 100
 		}),
-		panels = element.find( ".ui-accordion-content" );
+		panels = element.find( ".ui-accordion-content" ),
 		animate = $.fn.animate;
 	// called twice (both panels)
 	$.fn.animate = function( props, duration, easing ) {
@@ -120,10 +120,10 @@ asyncTest( "{ animate: Number }", function() {
 asyncTest( "{ animate: String }", function() {
 	expect( 7 );
 	var element = $( "#list1" ).accordion({
-		animate: "linear"
-	}),
-	panels = element.find( ".ui-accordion-content" );
-	animate = $.fn.animate;
+			animate: "linear"
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
 	// called twice (both panels)
 	$.fn.animate = function( props, duration, easing ) {
 		equal( duration, undefined, "default duration" );
@@ -144,10 +144,10 @@ asyncTest( "{ animate: String }", function() {
 asyncTest( "{ animate: {} }", function() {
 	expect( 7 );
 	var element = $( "#list1" ).accordion({
-		animate: {}
-	}),
-	panels = element.find( ".ui-accordion-content" );
-	animate = $.fn.animate;
+			animate: {}
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
 	// called twice (both panels)
 	$.fn.animate = function( props, duration, easing ) {
 		equal( duration, undefined, "default duration" );
@@ -168,10 +168,10 @@ asyncTest( "{ animate: {} }", function() {
 asyncTest( "{ animate: { duration, easing } }", function() {
 	expect( 7 );
 	var element = $( "#list1" ).accordion({
-		animate: { duration: 100, easing: "linear" }
-	}),
-	panels = element.find( ".ui-accordion-content" );
-	animate = $.fn.animate;
+			animate: { duration: 100, easing: "linear" }
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
 	// called twice (both panels)
 	$.fn.animate = function( props, duration, easing ) {
 		equal( duration, 100, "correct duration" );
@@ -192,11 +192,11 @@ asyncTest( "{ animate: { duration, easing } }", function() {
 asyncTest( "{ animate: { duration, easing } }, animate down", function() {
 	expect( 7 );
 	var element = $( "#list1" ).accordion({
-		active: 1,
-		animate: { duration: 100, easing: "linear" }
-	}),
-	panels = element.find( ".ui-accordion-content" );
-	animate = $.fn.animate;
+			active: 1,
+			animate: { duration: 100, easing: "linear" }
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
 	// called twice (both panels)
 	$.fn.animate = function( props, duration, easing ) {
 		equal( duration, 100, "correct duration" );
@@ -217,17 +217,17 @@ asyncTest( "{ animate: { duration, easing } }, animate down", function() {
 asyncTest( "{ animate: { duration, easing, down } }, animate down", function() {
 	expect( 7 );
 	var element = $( "#list1" ).accordion({
-		active: 1,
-		animate: {
-			duration: 100,
-			easing: "linear",
-			down: {
-				easing: "swing"
+			active: 1,
+			animate: {
+				duration: 100,
+				easing: "linear",
+				down: {
+					easing: "swing"
+				}
 			}
-		}
-	}),
-	panels = element.find( ".ui-accordion-content" );
-	animate = $.fn.animate;
+		}),
+		panels = element.find( ".ui-accordion-content" ),
+		animate = $.fn.animate;
 	// called twice (both panels)
 	$.fn.animate = function( props, duration, easing ) {
 		equal( duration, 100, "correct duration" );
@@ -360,10 +360,10 @@ test( "{ heightStyle: 'auto' }", function() {
 
 test( "{ heightStyle: 'content' }", function() {
 	expect( 3 );
-	var element = $( "#navigation" ).accordion({ heightStyle: "content" });
-	var sizes = element.find( ".ui-accordion-content" ).map(function() {
-		return $( this ).height();
-	}).get();
+	var element = $( "#navigation" ).accordion({ heightStyle: "content" }),
+		sizes = element.find( ".ui-accordion-content" ).map(function() {
+			return $( this ).height();
+		}).get();
 	ok( sizes[ 0 ] >= 70 && sizes[ 0 ] <= 105, "was " + sizes[ 0 ] );
 	ok( sizes[ 1 ] >= 98 && sizes[ 1 ] <= 126, "was " + sizes[ 1 ] );
 	ok( sizes[ 2 ] >= 42 && sizes[ 2 ] <= 54, "was " + sizes[ 2 ] );
diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/accordion_test_helpers.js
index 542809ea0..889608fba 100644
--- a/tests/unit/accordion/accordion_test_helpers.js
+++ b/tests/unit/accordion/accordion_test_helpers.js
@@ -1,6 +1,6 @@
 function accordion_state( accordion ) {
-	var expected = $.makeArray( arguments ).slice( 1 );
-	var actual = accordion.find( ".ui-accordion-content" ).map(function() {
+	var expected = $.makeArray( arguments ).slice( 1 ),
+		actual = accordion.find( ".ui-accordion-content" ).map(function() {
 		return $( this ).css( "display" ) === "none" ? 0 : 1;
 	}).get();
 	QUnit.push( QUnit.equiv(actual, expected), actual, expected );
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index 1c7ff7462..082263a35 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -123,7 +123,7 @@ asyncTest( "cancel search", function() {
 
 asyncTest( "cancel focus", function() {
 	expect( 1 );
-	var customVal = "custom value";
+	var customVal = "custom value",
 		element = $( "#autocomplete" ).autocomplete({
 			delay: 0,
 			source: data,
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.js
index c110b4311..0d93ecedf 100644
--- a/tests/unit/button/button_core.js
+++ b/tests/unit/button/button_core.js
@@ -8,7 +8,7 @@
 module("button: core");
 
 test("checkbox", function() {
-	var input = $("#check");
+	var input = $("#check"),
 		label = $("label[for=check]");
 	ok( input.is(":visible") );
 	ok( label.is(":not(.ui-button)") );
@@ -18,7 +18,7 @@ test("checkbox", function() {
 });
 
 test("radios", function() {
-	var inputs = $("#radio0 input");
+	var inputs = $("#radio0 input"),
 		labels = $("#radio0 label");
 	ok( inputs.is(":visible") );
 	ok( labels.is(":not(.ui-button)") );
@@ -51,7 +51,7 @@ test("radio groups", function() {
 });
 
 test("input type submit, don't create child elements", function() {
-	var input = $("#submit")
+	var input = $("#submit");
 	deepEqual( input.children().length, 0 );
 	input.button();
 	deepEqual( input.children().length, 0 );
@@ -68,11 +68,12 @@ test("buttonset", function() {
 });
 
 test("buttonset (rtl)", function() {
-	var parent = $("#radio1").parent();
+	var set,
+		parent = $("#radio1").parent();
 	// Set to rtl
 	parent.attr("dir", "rtl");
 
-	var set = $("#radio1").buttonset();
+	set = $("#radio1").buttonset();
 	ok( set.is(".ui-buttonset") );
 	deepEqual( set.children(".ui-button").length, 3 );
 	deepEqual( set.children("input:radio.ui-helper-hidden-accessible").length, 3 );
diff --git a/tests/unit/button/button_methods.js b/tests/unit/button/button_methods.js
index a83a73ba4..347806d4e 100644
--- a/tests/unit/button/button_methods.js
+++ b/tests/unit/button/button_methods.js
@@ -7,8 +7,8 @@
 module("button: methods");
 
 test("destroy", function() {
-	var beforeHtml = $("#button").parent().html();
-	var afterHtml = $("#button").button().button("destroy").parent().html();
+	var beforeHtml = $("#button").parent().html(),
+		afterHtml = $("#button").button().button("destroy").parent().html();
 	// Opera 9 outputs role="" instead of removing the attribute like everyone else
 	if ($.browser.opera) {
 		afterHtml = afterHtml.replace(/ role=""/g, "");
-- 
cgit v1.2.3


From 266cc84013c7c4d57771b2e4d0cdac3763a6764b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 11:17:35 -0400
Subject: Tests: Lint.

---
 grunt.js                                    |   4 +
 tests/unit/datepicker/datepicker_core.js    |  80 +++++-----
 tests/unit/datepicker/datepicker_events.js  |  17 +-
 tests/unit/datepicker/datepicker_methods.js |  34 ++--
 tests/unit/datepicker/datepicker_options.js | 231 ++++++++++++++--------------
 tests/unit/datepicker/datepicker_tickets.js |  14 +-
 6 files changed, 191 insertions(+), 189 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 48be599b7..07bd7a6ed 100644
--- a/grunt.js
+++ b/grunt.js
@@ -350,6 +350,7 @@ grunt.initConfig({
 					accordion_equalHeights: true,
 					accordion_setupTeardown: true,
 					accordion_state: true,
+					addMonths: true,
 					asyncTest: true,
 					commonWidgetTests: true,
 					container: true,
@@ -362,9 +363,11 @@ grunt.initConfig({
 					dragged: true,
 					el: true,
 					equal: true,
+					equalsDate: true,
 					expect: true,
 					Globalize: true,
 					heightAfter: true,
+					init: true,
 					isNotOpen: true,
 					isOpen: true,
 					menu_click: true,
@@ -376,6 +379,7 @@ grunt.initConfig({
 					offsetAfter: true,
 					offsetBefore: true,
 					ok: true,
+					PROP_NAME: true,
 					QUnit: true,
 					restoreScroll: true,
 					shouldBeDroppable: true,
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index bbc447ffe..4bf04d83e 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -53,52 +53,52 @@ test("widget method", function() {
 });
 
 test('baseStructure', function() {
-	var inp = init('#inp');
-	inp.focus();
-	var dp = $('#ui-datepicker-div');
-	var iframe = ($.browser.msie && parseInt($.browser.version) < 7);
+	var header, title, table, thead, week, panel, inl, child,
+		inp = init('#inp').focus(),
+		dp = $('#ui-datepicker-div'),
+		iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
 	ok(dp.is(':visible'), 'Structure - datepicker visible');
 	ok(!dp.is('.ui-datepicker-rtl'), 'Structure - not right-to-left');
 	ok(!dp.is('.ui-datepicker-multi'), 'Structure - not multi-month');
 	equal(dp.children().length, 2 + (iframe ? 1 : 0), 'Structure - child count');
 
-	var header = dp.children(':first');
+	header = dp.children(':first');
 	ok(header.is('div.ui-datepicker-header'), 'Structure - header division');
 	equal(header.children().length, 3, 'Structure - header child count');
-	ok(header.children(':first').is('a.ui-datepicker-prev') && header.children(':first').html() != '', 'Structure - prev link');
-	ok(header.children(':eq(1)').is('a.ui-datepicker-next') && header.children(':eq(1)').html() != '', 'Structure - next link');
+	ok(header.children(':first').is('a.ui-datepicker-prev') && header.children(':first').html() !== '', 'Structure - prev link');
+	ok(header.children(':eq(1)').is('a.ui-datepicker-next') && header.children(':eq(1)').html() !== '', 'Structure - next link');
 
-	var title = header.children(':last');
-	ok(title.is('div.ui-datepicker-title') && title.html() != '','Structure - title division');
+	title = header.children(':last');
+	ok(title.is('div.ui-datepicker-title') && title.html() !== '','Structure - title division');
 	equal(title.children().length, 2, 'Structure - title child count');
-	ok(title.children(':first').is('span.ui-datepicker-month') && title.children(':first').text() != '', 'Structure - month text')
-	ok(title.children(':last').is('span.ui-datepicker-year') && title.children(':last').text() != '', 'Structure - year text')
+	ok(title.children(':first').is('span.ui-datepicker-month') && title.children(':first').text() !== '', 'Structure - month text');
+	ok(title.children(':last').is('span.ui-datepicker-year') && title.children(':last').text() !== '', 'Structure - year text');
 
-	var table = dp.children(':eq(1)');
+	table = dp.children(':eq(1)');
 	ok(table.is('table.ui-datepicker-calendar'), 'Structure - month table');
 	ok(table.children(':first').is('thead'), 'Structure - month table thead');
-	var thead = table.children(':first').children(':first');
+	thead = table.children(':first').children(':first');
 	ok(thead.is('tr'), 'Structure - month table title row');
 	equal(thead.find('th').length, 7, 'Structure - month table title cells');
 	ok(table.children(':eq(1)').is('tbody'), 'Structure - month table body');
 	ok(table.children(':eq(1)').children('tr').length >= 4, 'Structure - month table week count');
-	var week = table.children(':eq(1)').children(':first');
+	week = table.children(':eq(1)').children(':first');
 	ok(week.is('tr'), 'Structure - month table week row');
 	equal(week.children().length, 7, 'Structure - week child count');
 	ok(week.children(':first').is('td.ui-datepicker-week-end'), 'Structure - month table first day cell');
 	ok(week.children(':last').is('td.ui-datepicker-week-end'), 'Structure - month table second day cell');
-	ok(dp.children('iframe').length == (iframe ? 1 : 0), 'Structure - iframe');
+	ok(dp.children('iframe').length === (iframe ? 1 : 0), 'Structure - iframe');
 	inp.datepicker('hide').datepicker('destroy');
 
 	// Editable month/year and button panel
 	inp = init('#inp', {changeMonth: true, changeYear: true, showButtonPanel: true});
 	inp.focus();
 
-	var title = dp.find('div.ui-datepicker-title');
+	title = dp.find('div.ui-datepicker-title');
 	ok(title.children(':first').is('select.ui-datepicker-month'), 'Structure - month selector');
 	ok(title.children(':last').is('select.ui-datepicker-year'), 'Structure - year selector');
 
-	var panel = dp.children(':last');
+	panel = dp.children(':last');
 	ok(panel.is('div.ui-datepicker-buttonpane'), 'Structure - button panel division');
 	equal(panel.children().length, 2, 'Structure - button panel child count');
 	ok(panel.children(':first').is('button.ui-datepicker-current'), 'Structure - today button');
@@ -110,7 +110,7 @@ test('baseStructure', function() {
 	inp.focus();
 	ok(dp.is('.ui-datepicker-multi'), 'Structure multi [2] - multi-month');
 	equal(dp.children().length, 3 + (iframe ? 1 : 0), 'Structure multi [2] - child count');
-	var child = dp.children(':first');
+	child = dp.children(':first');
 	ok(child.is('div.ui-datepicker-group') && child.is('div.ui-datepicker-group-first'), 'Structure multi [2] - first month division');
 	child = dp.children(':eq(1)');
 	ok(child.is('div.ui-datepicker-group') && child.is('div.ui-datepicker-group-last'), 'Structure multi [2] - second month division');
@@ -146,16 +146,16 @@ test('baseStructure', function() {
 	inp.datepicker('hide').datepicker('destroy');
 
 	// Inline
-	var inl = init('#inl');
+	inl = init('#inl');
 	dp = inl.children();
 	ok(dp.is('.ui-datepicker-inline'), 'Structure inline - main div');
 	ok(!dp.is('.ui-datepicker-rtl'), 'Structure inline - not right-to-left');
 	ok(!dp.is('.ui-datepicker-multi'), 'Structure inline - not multi-month');
 	equal(dp.children().length, 2, 'Structure inline - child count');
-	var header = dp.children(':first');
+	header = dp.children(':first');
 	ok(header.is('div.ui-datepicker-header'), 'Structure inline - header division');
 	equal(header.children().length, 3, 'Structure inline - header child count');
-	var table = dp.children(':eq(1)');
+	table = dp.children(':eq(1)');
 	ok(table.is('table.ui-datepicker-calendar'), 'Structure inline - month table');
 	ok(table.children(':first').is('thead'), 'Structure inline - month table thead');
 	ok(table.children(':eq(1)').is('tbody'), 'Structure inline - month table body');
@@ -176,19 +176,20 @@ test('baseStructure', function() {
 });
 
 test('customStructure', function() {
-	var dp = $('#ui-datepicker-div');
-	// Check right-to-left localisation
-	var inp = init('#inp', $.datepicker.regional['he']);
+	var iframe, header, panel, title, thead,
+		dp = $('#ui-datepicker-div'),
+		// Check right-to-left localisation
+		inp = init('#inp', $.datepicker.regional.he);
 	inp.data('showButtonPanel.datepicker',true);
 	inp.focus();
-	var iframe = ($.browser.msie && parseInt($.browser.version) < 7);
+	iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
 	ok(dp.is('.ui-datepicker-rtl'), 'Structure RTL - right-to-left');
-	var header = dp.children(':first');
+	header = dp.children(':first');
 	ok(header.is('div.ui-datepicker-header'), 'Structure RTL - header division');
 	equal(header.children().length, 3, 'Structure RTL - header child count');
 	ok(header.children(':first').is('a.ui-datepicker-next'), 'Structure RTL - prev link');
 	ok(header.children(':eq(1)').is('a.ui-datepicker-prev'), 'Structure RTL - next link');
-	var panel = dp.children(':last');
+	panel = dp.children(':last');
 	ok(panel.is('div.ui-datepicker-buttonpane'), 'Structure RTL - button division');
 	equal(panel.children().length, 2, 'Structure RTL - button panel child count');
 	ok(panel.children(':first').is('button.ui-datepicker-close'), 'Structure RTL - close button');
@@ -198,7 +199,7 @@ test('customStructure', function() {
 	// Hide prev/next
 	inp = init('#inp', {hideIfNoPrevNext: true, minDate: new Date(2008, 2 - 1, 4), maxDate: new Date(2008, 2 - 1, 14)});
 	inp.val('02/10/2008').focus();
-	var header = dp.children(':first');
+	header = dp.children(':first');
 	ok(header.is('div.ui-datepicker-header'), 'Structure hide prev/next - header division');
 	equal(header.children().length, 1, 'Structure hide prev/next - links child count');
 	ok(header.children(':first').is('div.ui-datepicker-title'), 'Structure hide prev/next - title division');
@@ -207,7 +208,7 @@ test('customStructure', function() {
 	// Changeable Month with read-only year
 	inp = init('#inp', {changeMonth: true});
 	inp.focus();
-	var title = dp.children(':first').children(':last');
+	title = dp.children(':first').children(':last');
 	equal(title.children().length, 2, 'Structure changeable month - title child count');
 	ok(title.children(':first').is('select.ui-datepicker-month'), 'Structure changeable month - month selector');
 	ok(title.children(':last').is('span.ui-datepicker-year'), 'Structure changeable month - read-only year');
@@ -216,7 +217,7 @@ test('customStructure', function() {
 	// Changeable year with read-only month
 	inp = init('#inp', {changeYear: true});
 	inp.focus();
-	var title = dp.children(':first').children(':last');
+	title = dp.children(':first').children(':last');
 	equal(title.children().length, 2, 'Structure changeable year - title child count');
 	ok(title.children(':first').is('span.ui-datepicker-month'), 'Structure changeable year - read-only month');
 	ok(title.children(':last').is('select.ui-datepicker-year'), 'Structure changeable year - year selector');
@@ -225,15 +226,15 @@ test('customStructure', function() {
 	// Read-only first day of week
 	inp = init('#inp', {changeFirstDay: false});
 	inp.focus();
-	var thead = dp.find('.ui-datepicker-calendar thead tr');
+	thead = dp.find('.ui-datepicker-calendar thead tr');
 	equal(thead.children().length, 7, 'Structure read-only first day - thead child count');
 	equal(thead.find('a').length, 0, 'Structure read-only first day - thead links count');
 	inp.datepicker('hide').datepicker('destroy');
 });
 
 test('keystrokes', function() {
-	var inp = init('#inp');
-	var date = new Date();
+	var inp = init('#inp'),
+		date = new Date();
 	inp.val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	equalsDate(inp.datepicker('getDate'), date, 'Keystroke enter');
@@ -366,9 +367,10 @@ test('keystrokes', function() {
 });
 
 test('mouse', function() {
-	var inp = init('#inp');
-	var dp = $('#ui-datepicker-div');
-	var date = new Date();
+	var inl,
+		inp = init('#inp'),
+		dp = $('#ui-datepicker-div'),
+		date = new Date();
 	inp.val('').datepicker('show');
 	$('.ui-datepicker-calendar tbody a:contains(10)', dp).simulate('click', {});
 	date.setDate(10);
@@ -419,9 +421,9 @@ test('mouse', function() {
 	equalsDate(inp.datepicker('getDate'), new Date(2008, 2 - 1, 18),
 		'Mouse click - next + min/max');
 	// Inline
-	var inl = init('#inl');
-	var dp = $('.ui-datepicker-inline', inl);
-	var date = new Date();
+	inl = init('#inl');
+	dp = $('.ui-datepicker-inline', inl);
+	date = new Date();
 	inl.datepicker('setDate', date);
 	$('.ui-datepicker-calendar tbody a:contains(10)', dp).simulate('click', {});
 	date.setDate(10);
diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/datepicker_events.js
index 9876b7e60..b3e6704ef 100644
--- a/tests/unit/datepicker/datepicker_events.js
+++ b/tests/unit/datepicker/datepicker_events.js
@@ -5,9 +5,9 @@
 
 module("datepicker: events");
 
-var selectedThis = null;
-var selectedDate = null;
-var selectedInst = null;
+var selectedThis = null,
+selectedDate = null,
+selectedInst = null;
 
 function callback(date, inst) {
 	selectedThis = this;
@@ -22,8 +22,9 @@ function callback2(year, month, inst) {
 }
 
 test('events', function() {
-	var inp = init('#inp', {onSelect: callback});
-	var date = new Date();
+	var dateStr, newMonthYear, inp2,
+		inp = init('#inp', {onSelect: callback}),
+	date = new Date();
 	// onSelect
 	inp.val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
@@ -41,7 +42,7 @@ test('events', function() {
 		simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
 	equal(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
 		'Callback selected date - esc');
-    var dateStr = '02/04/2008';
+    dateStr = '02/04/2008';
     inp.val(dateStr).datepicker('show').
         simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
     equal(dateStr, selectedDate,
@@ -49,7 +50,7 @@ test('events', function() {
 	// onChangeMonthYear
 	inp.datepicker('option', {onChangeMonthYear: callback2, onSelect: null}).
 		val('').datepicker('show');
-	var newMonthYear = function(date) {
+	newMonthYear = function(date) {
 		return date.getFullYear() + '/' + (date.getMonth() + 1);
 	};
 	date = new Date();
@@ -118,7 +119,7 @@ test('events', function() {
 		simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.END});
 	equal(selectedDate, '', 'Callback close date - ctrl+end');
 
-	var inp2 = init('#inp2');
+	inp2 = init('#inp2');
 	inp2.datepicker().datepicker('option', {onClose: callback}).datepicker('show');
 	inp.datepicker('show');
 	equal(selectedThis, inp2[0], 'Callback close this');
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index c8f1b75b2..603427440 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -6,7 +6,8 @@
 module("datepicker: methods");
 
 test('destroy', function() {
-	var inp = init('#inp');
+	var inl,
+		inp = init('#inp');
 	ok(inp.is('.hasDatepicker'), 'Default - marker class set');
 	ok($.data(inp[0], PROP_NAME), 'Default - instance present');
 	ok(inp.next().is('#alt'), 'Default - button absent');
@@ -19,7 +20,7 @@ test('destroy', function() {
 	inp= init('#inp', {showOn: 'both'});
 	ok(inp.is('.hasDatepicker'), 'Button - marker class set');
 	ok($.data(inp[0], PROP_NAME), 'Button - instance present');
-	ok(inp.next().text() == '...', 'Button - button added');
+	ok(inp.next().text() === '...', 'Button - button added');
 	inp.datepicker('destroy');
 	inp = $('#inp');
 	ok(!inp.is('.hasDatepicker'), 'Button - marker class cleared');
@@ -29,7 +30,7 @@ test('destroy', function() {
 	inp = init('#inp', {appendText: 'Testing'});
 	ok(inp.is('.hasDatepicker'), 'Append - marker class set');
 	ok($.data(inp[0], PROP_NAME), 'Append - instance present');
-	ok(inp.next().text() == 'Testing', 'Append - append text added');
+	ok(inp.next().text() === 'Testing', 'Append - append text added');
 	inp.datepicker('destroy');
 	inp = $('#inp');
 	ok(!inp.is('.hasDatepicker'), 'Append - marker class cleared');
@@ -40,29 +41,30 @@ test('destroy', function() {
 		buttonImage: 'img/calendar.gif', appendText: 'Testing'});
 	ok(inp.is('.hasDatepicker'), 'Both - marker class set');
 	ok($.data(inp[0], PROP_NAME), 'Both - instance present');
-	ok(inp.next()[0].nodeName.toLowerCase() == 'img', 'Both - button added');
-	ok(inp.next().next().text() == 'Testing', 'Both - append text added');
+	ok(inp.next()[0].nodeName.toLowerCase() === 'img', 'Both - button added');
+	ok(inp.next().next().text() === 'Testing', 'Both - append text added');
 	inp.datepicker('destroy');
 	inp = $('#inp');
 	ok(!inp.is('.hasDatepicker'), 'Both - marker class cleared');
 	ok(!$.data(inp[0], PROP_NAME), 'Both - instance absent');
 	ok(inp.next().is('#alt'), 'Both - button and append text absent');
 	// Inline
-	var inl = init('#inl');
+	inl = init('#inl');
 	ok(inl.is('.hasDatepicker'), 'Inline - marker class set');
-	ok(inl.html() != '', 'Inline - datepicker present');
+	ok(inl.html() !== '', 'Inline - datepicker present');
 	ok($.data(inl[0], PROP_NAME), 'Inline - instance present');
-	ok(inl.next().length == 0 || inl.next().is('p'), 'Inline - button absent');
+	ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent');
 	inl.datepicker('destroy');
 	inl = $('#inl');
 	ok(!inl.is('.hasDatepicker'), 'Inline - marker class cleared');
-	ok(inl.html() == '', 'Inline - datepicker absent');
+	ok(inl.html() === '', 'Inline - datepicker absent');
 	ok(!$.data(inl[0], PROP_NAME), 'Inline - instance absent');
-	ok(inl.next().length == 0 || inl.next().is('p'), 'Inline - button absent');
+	ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent');
 });
 
 test('enableDisable', function() {
-	var inp = init('#inp');
+	var inl, dp,
+		inp = init('#inp');
 	ok(!inp.datepicker('isDisabled'), 'Enable/disable - initially marked as enabled');
 	ok(!inp[0].disabled, 'Enable/disable - field initially enabled');
 	inp.datepicker('disable');
@@ -91,19 +93,19 @@ test('enableDisable', function() {
 		buttonImage: 'img/calendar.gif'});
 	ok(!inp.datepicker('isDisabled'), 'Enable/disable image - initially marked as enabled');
 	ok(!inp[0].disabled, 'Enable/disable image - field initially enabled');
-	ok(inp.next('img').css('opacity') == 1, 'Enable/disable image - image initially enabled');
+	ok(parseFloat(inp.next('img').css('opacity')) === 1, 'Enable/disable image - image initially enabled');
 	inp.datepicker('disable');
 	ok(inp.datepicker('isDisabled'), 'Enable/disable image - now marked as disabled');
 	ok(inp[0].disabled, 'Enable/disable image - field now disabled');
-	ok(inp.next('img').css('opacity') != 1, 'Enable/disable image - image now disabled');
+	ok(parseFloat(inp.next('img').css('opacity')) !== 1, 'Enable/disable image - image now disabled');
 	inp.datepicker('enable');
 	ok(!inp.datepicker('isDisabled'), 'Enable/disable image - now marked as enabled');
 	ok(!inp[0].disabled, 'Enable/disable image - field now enabled');
-	ok(inp.next('img').css('opacity') == 1, 'Enable/disable image - image now enabled');
+	ok(parseFloat(inp.next('img').css('opacity')) === 1, 'Enable/disable image - image now enabled');
 	inp.datepicker('destroy');
 	// Inline
-	var inl = init('#inl', {changeYear: true});
-	var dp = $('.ui-datepicker-inline', inl);
+	inl = init('#inl', {changeYear: true});
+	dp = $('.ui-datepicker-inline', inl);
 	ok(!inl.datepicker('isDisabled'), 'Enable/disable inline - initially marked as enabled');
 	ok(!dp.children().is('.ui-state-disabled'), 'Enable/disable inline - not visually disabled initially');
 	ok(!dp.find('select').prop('disabled'), 'Enable/disable inline - form element enabled initially');
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index f538c6d03..3e200ecaa 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -16,8 +16,8 @@ test('setDefaults', function() {
 });
 
 test('option', function() {
-	var inp = init('#inp');
-	var inst = $.data(inp[0], PROP_NAME);
+	var inp = init('#inp'),
+	inst = $.data(inp[0], PROP_NAME);
 	// Set option
 	equal(inst.settings.showOn, null, 'Initial setting showOn');
 	equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
@@ -47,8 +47,8 @@ test('option', function() {
 });
 
 test('change', function() {
-	var inp = init('#inp');
-	var inst = $.data(inp[0], PROP_NAME);
+	var inp = init('#inp'),
+	inst = $.data(inp[0], PROP_NAME);
 	equal(inst.settings.showOn, null, 'Initial setting showOn');
 	equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
 	equal($.datepicker._defaults.showOn, 'focus', 'Initial default showOn');
@@ -67,14 +67,15 @@ test('change', function() {
 });
 
 test('invocation', function() {
-	var inp = init('#inp');
-	var dp = $('#ui-datepicker-div');
-	var body = $('body');
+	var button, image,
+		inp = init('#inp'),
+		dp = $('#ui-datepicker-div'),
+		body = $('body');
 	// On focus
-	var button = inp.siblings('button');
-	ok(button.length == 0, 'Focus - button absent');
-	var image = inp.siblings('img');
-	ok(image.length == 0, 'Focus - image absent');
+	button = inp.siblings('button');
+	ok(button.length === 0, 'Focus - button absent');
+	image = inp.siblings('img');
+	ok(image.length === 0, 'Focus - image absent');
 	inp.focus();
 	ok(dp.is(':visible'), 'Focus - rendered on focus');
 	inp.simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
@@ -89,8 +90,8 @@ test('invocation', function() {
 	ok(!dp.is(':visible'), 'Button - initially hidden');
 	button = inp.siblings('button');
 	image = inp.siblings('img');
-	ok(button.length == 1, 'Button - button present');
-	ok(image.length == 0, 'Button - image absent');
+	ok(button.length === 1, 'Button - button present');
+	ok(image.length === 0, 'Button - image absent');
 	equal(button.text(), 'Popup', 'Button - button text');
 	inp.focus();
 	ok(!dp.is(':visible'), 'Button - not rendered on focus');
@@ -104,9 +105,9 @@ test('invocation', function() {
 		buttonImage: 'img/calendar.gif', buttonText: 'Cal'});
 	ok(!dp.is(':visible'), 'Image button - initially hidden');
 	button = inp.siblings('button');
-	ok(button.length == 0, 'Image button - button absent');
+	ok(button.length === 0, 'Image button - button absent');
 	image = inp.siblings('img');
-	ok(image.length == 1, 'Image button - image present');
+	ok(image.length === 1, 'Image button - image present');
 	equal(image.attr('src'), 'img/calendar.gif', 'Image button - image source');
 	equal(image.attr('title'), 'Cal', 'Image button - image text');
 	inp.focus();
@@ -120,11 +121,11 @@ test('invocation', function() {
 	inp = init('#inp', {showOn: 'both', buttonImage: 'img/calendar.gif'});
 	ok(!dp.is(':visible'), 'Both - initially hidden');
 	button = inp.siblings('button');
-	ok(button.length == 1, 'Both - button present');
+	ok(button.length === 1, 'Both - button present');
 	image = inp.siblings('img');
-	ok(image.length == 0, 'Both - image absent');
+	ok(image.length === 0, 'Both - image absent');
 	image = button.children('img');
-	ok(image.length == 1, 'Both - button image present');
+	ok(image.length === 1, 'Both - button image present');
 	inp.focus();
 	ok(dp.is(':visible'), 'Both - rendered on focus');
 	body.simulate('mousedown', {});
@@ -137,29 +138,29 @@ test('invocation', function() {
 });
 
 test('otherMonths', function() {
-	var inp = init('#inp');
-	var pop = $('#ui-datepicker-div');
+	var inp = init('#inp'),
+		pop = $('#ui-datepicker-div');
 	inp.val('06/01/2009').datepicker('show');
 	equal(pop.find('tbody').text(), '\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0',
 		'Other months - none');
-	ok(pop.find('td:last *').length == 0, 'Other months - no content');
+	ok(pop.find('td:last *').length === 0, 'Other months - no content');
 	inp.datepicker('hide').datepicker('option', 'showOtherMonths', true).datepicker('show');
 	equal(pop.find('tbody').text(), '311234567891011121314151617181920212223242526272829301234',
 		'Other months - show');
-	ok(pop.find('td:last span').length == 1, 'Other months - span content');
+	ok(pop.find('td:last span').length === 1, 'Other months - span content');
 	inp.datepicker('hide').datepicker('option', 'selectOtherMonths', true).datepicker('show');
 	equal(pop.find('tbody').text(), '311234567891011121314151617181920212223242526272829301234',
 		'Other months - select');
-	ok(pop.find('td:last a').length == 1, 'Other months - link content');
+	ok(pop.find('td:last a').length === 1, 'Other months - link content');
 	inp.datepicker('hide').datepicker('option', 'showOtherMonths', false).datepicker('show');
 	equal(pop.find('tbody').text(), '\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0',
 		'Other months - none');
-	ok(pop.find('td:last *').length == 0, 'Other months - no content');
+	ok(pop.find('td:last *').length === 0, 'Other months - no content');
 });
 
 test('defaultDate', function() {
-	var inp = init('#inp');
-	var date = new Date();
+	var inp = init('#inp'),
+		date = new Date();
 	inp.val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	equalsDate(inp.datepicker('getDate'), date, 'Default date null');
@@ -252,17 +253,19 @@ test('defaultDate', function() {
 });
 
 test('miscellaneous', function() {
-	var dp = $('#ui-datepicker-div');
-	var inp = init('#inp');
+	var curYear, longNames, shortNames, date,
+		dp = $('#ui-datepicker-div'),
+		inp = init('#inp');
 	// Year range
-	var genRange = function(start, offset) {
-		var range = '';
-		for (var i = start; i < start + offset; i++) {
+	function genRange(start, offset) {
+		var i = start,
+			range = '';
+		for (; i < start + offset; i++) {
 			range += i;
 		}
 		return range;
-	};
-	var curYear = new Date().getFullYear();
+	}
+	curYear = new Date().getFullYear();
 	inp.val('02/04/2008').datepicker('show');
 	equal(dp.find('.ui-datepicker-year').text(), '2008', 'Year range - read-only default');
 	inp.datepicker('hide').datepicker('option', {changeYear: true}).datepicker('show');
@@ -285,9 +288,9 @@ test('miscellaneous', function() {
 	equal(dp.find('.ui-datepicker-next').text(), 'Next', 'Navigation next - default');
 	inp.datepicker('hide').datepicker('option', {navigationAsDateFormat: true, prevText: '< M', currentText: 'MM', nextText: 'M >'}).
 		val('02/04/2008').datepicker('show');
-	var longNames = $.datepicker.regional[''].monthNames;
-	var shortNames = $.datepicker.regional[''].monthNamesShort;
-	var date = new Date();
+	longNames = $.datepicker.regional[''].monthNames;
+	shortNames = $.datepicker.regional[''].monthNamesShort;
+	date = new Date();
 	equal(dp.find('.ui-datepicker-prev').text(), '< ' + shortNames[0], 'Navigation prev - as date format');
 	equal(dp.find('.ui-datepicker-current').text(),
 		longNames[date.getMonth()], 'Navigation current - as date format');
@@ -311,11 +314,12 @@ test('miscellaneous', function() {
 });
 
 test('minMax', function() {
-	var inp = init('#inp');
-	var lastYear = new Date(2007, 6 - 1, 4);
-	var nextYear = new Date(2009, 6 - 1, 4);
-	var minDate = new Date(2008, 2 - 1, 29);
-	var maxDate = new Date(2008, 12 - 1, 7);
+	var date,
+		inp = init('#inp'),
+		lastYear = new Date(2007, 6 - 1, 4),
+		nextYear = new Date(2009, 6 - 1, 4),
+		minDate = new Date(2008, 2 - 1, 29),
+		maxDate = new Date(2008, 12 - 1, 7);
 	inp.val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
@@ -360,7 +364,7 @@ test('minMax', function() {
 	equalsDate(inp.datepicker('getDate'), maxDate,
 		'Min/max - null, 12/07/2008 - ctrl+pgdn');
 	// Relative dates
-	var date = new Date();
+	date = new Date();
 	date.setDate(date.getDate() - 7);
 	inp.datepicker('option', {minDate: '-1w', maxDate: '+1 M +10 D '}).
 		datepicker('hide').val('').datepicker('show');
@@ -394,9 +398,10 @@ test('minMax', function() {
 });
 
 test('setDate', function() {
-	var inp = init('#inp');
-	var date1 = new Date(2008, 6 - 1, 4);
-	var date2 = new Date();
+	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
+		inp = init('#inp'),
+		date1 = new Date(2008, 6 - 1, 4),
+		date2 = new Date();
 	ok(inp.datepicker('getDate') == null, 'Set date - default');
 	inp.datepicker('setDate', date1);
 	equalsDate(inp.datepicker('getDate'), date1, 'Set date - 2008-06-04');
@@ -423,7 +428,7 @@ test('setDate', function() {
 	inp.datepicker('setDate', 'c -3 w');
 	equalsDate(inp.datepicker('getDate'), date1, 'Set date - c -3 w');
 	// Inline
-	var inl = init('#inl');
+	inl = init('#inl');
 	date1 = new Date(2008, 6 - 1, 4);
 	date2 = new Date();
 	equalsDate(inl.datepicker('getDate'), date2, 'Set date inline - default');
@@ -441,7 +446,7 @@ test('setDate', function() {
 	inl.datepicker('setDate');
 	ok(inl.datepicker('getDate') == null, 'Set date inline - null');
 	// Alternate field
-	var alt = $('#alt');
+	alt = $('#alt');
 	inp.datepicker('option', {altField: '#alt', altFormat: 'yy-mm-dd'});
 	date1 = new Date(2008, 6 - 1, 4);
 	inp.datepicker('setDate', date1);
@@ -451,8 +456,8 @@ test('setDate', function() {
 	inp = init('#inp');
 	date1 = new Date(2008, 1 - 1, 4);
 	date2 = new Date(2008, 6 - 1, 4);
-	var minDate = new Date(2008, 2 - 1, 29);
-	var maxDate = new Date(2008, 3 - 1, 28);
+	minDate = new Date(2008, 2 - 1, 29);
+	maxDate = new Date(2008, 3 - 1, 28);
 	inp.val('').datepicker('option', {minDate: minDate}).datepicker('setDate', date2);
 	equalsDate(inp.datepicker('getDate'), date2, 'Set date min/max - setDate > min');
 	inp.datepicker('setDate', date1);
@@ -465,15 +470,15 @@ test('setDate', function() {
 	equalsDate(inp.datepicker('getDate'), minDate, 'Set date min/max - setDate < min');
 	inp.datepicker('setDate', date2);
 	equalsDate(inp.datepicker('getDate'), maxDate, 'Set date min/max - setDate > max');
-	var dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
-	var dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
+	dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
+	dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
 	inp.datepicker('setDate', dateAndTimeToSet);
 	equal(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), 'Date object passed should not be changed by setDate');
 });
 
 test('altField', function() {
-	var inp = init('#inp');
-	var alt = $('#alt');
+	var inp = init('#inp'),
+		alt = $('#alt');
 	// No alternate field set
 	alt.val('');
 	inp.val('06/04/2008').datepicker('show');
@@ -507,26 +512,6 @@ test('altField', function() {
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.END});
 	equal(inp.val(), '', 'Alt field - dp - ctrl+end');
 	equal(alt.val(), '', 'Alt field - alt - ctrl+end');
-
-	return
-	// TODO manual entry impl works (see altField demo) but this test doesn't
-	// probably something the rewrite won't cover anymore anyway
-
-	// Verify alt field is updated on keyup
-	alt.val('');
-	inp.val('06/04/200').datepicker('show');
-	inp.simulate('keydown', {charCode: '8'.charCodeAt(0)});
-	inp.simulate('keypress', {charCode: '8'.charCodeAt(0)});
-	inp.simulate('keyup', {charCode: '8'.charCodeAt(0)});
-	equal(inp.val(), '06/04/2008', 'Alt field - dp - manual entry');
-	equal(alt.val(), '2008-06-04', 'Alt field - manual entry');
-	// Verify alt field is not updated on keyup if date is invalid
-	inp.val('12/04');
-	inp.simulate('keydown', {charCode: '/'.charCodeAt(0)});
-	inp.simulate('keypress', {charCode: '/'.charCodeAt(0)});
-	inp.simulate('keyup', {charCode: '/'.charCodeAt(0)});
-	equal(inp.val(), '12/04/', 'Alt field - dp - manual entry incomplete');
-	equal(alt.val(), '2008-06-04', 'Alt field - manual entry - not updated');
 });
 
 test('autoSize', function() {
@@ -541,7 +526,7 @@ test('autoSize', function() {
 	inp.datepicker('option', 'dateFormat', 'DD, MM dd, yy');
 	equal(inp.prop('size'), 29, 'Auto size - DD, MM dd, yy');
 	// French
-	inp.datepicker('option', $.extend({autoSize: false}, $.datepicker.regional['fr']));
+	inp.datepicker('option', $.extend({autoSize: false}, $.datepicker.regional.fr));
 	equal(inp.prop('size'), 29, 'Auto size - fr - default');
 	inp.datepicker('option', 'autoSize', true);
 	equal(inp.prop('size'), 10, 'Auto size - fr - dd/mm/yy');
@@ -552,7 +537,7 @@ test('autoSize', function() {
 	inp.datepicker('option', 'dateFormat', 'DD, MM dd, yy');
 	equal(inp.prop('size'), 28, 'Auto size - fr - DD, MM dd, yy');
 	// Hebrew
-	inp.datepicker('option', $.extend({autoSize: false}, $.datepicker.regional['he']));
+	inp.datepicker('option', $.extend({autoSize: false}, $.datepicker.regional.he));
 	equal(inp.prop('size'), 28, 'Auto size - he - default');
 	inp.datepicker('option', 'autoSize', true);
 	equal(inp.prop('size'), 10, 'Auto size - he - dd/mm/yy');
@@ -565,8 +550,8 @@ test('autoSize', function() {
 });
 
 test('daylightSaving', function() {
-	var inp = init('#inp');
-	var dp = $('#ui-datepicker-div');
+	var inp = init('#inp'),
+		dp = $('#ui-datepicker-div');
 	ok(true, 'Daylight saving - ' + new Date());
 	// Australia, Sydney - AM change, southern hemisphere
 	inp.val('04/01/2008').datepicker('show');
@@ -646,9 +631,12 @@ test('daylightSaving', function() {
 	equal(inp.val(), '11/03/2008', 'Daylight saving - US 11/03/2008');
 });
 
-var beforeShowThis = null;
-var beforeShowInput = null;
-var beforeShowInst = null;
+var beforeShowThis = null,
+	beforeShowInput = null,
+	beforeShowInst = null,
+	beforeShowDayThis = null,
+	beforeShowDayOK = true;
+
 
 function beforeAll(input, inst) {
 	beforeShowThis = this;
@@ -657,84 +645,86 @@ function beforeAll(input, inst) {
 	return {currentText: 'Current'};
 }
 
-var beforeShowDayThis = null;
-var beforeShowDayOK = true;
-
 function beforeDay(date) {
 	beforeShowDayThis = this;
 	beforeShowDayOK &= (date > new Date(2008, 1 - 1, 26) &&
 		date < new Date(2008, 3 - 1, 6));
-	return [(date.getDate() % 2 == 0), (date.getDate() % 10 == 0 ? 'day10' : ''),
-		(date.getDate() % 3 == 0 ? 'Divisble by 3' : '')];
+	return [(date.getDate() % 2 === 0), (date.getDate() % 10 === 0 ? 'day10' : ''),
+		(date.getDate() % 3 === 0 ? 'Divisble by 3' : '')];
 }
 
 function calcWeek(date) {
-	var doy = date.getDate() + 6;
-	for (var m = date.getMonth() - 1; m >= 0; m--)
+	var doy = date.getDate() + 6,
+		m = date.getMonth() - 1;
+	for (; m >= 0; m--) {
 		doy += $.datepicker._getDaysInMonth(date.getFullYear(), m);
+	}
 	// Simple count from 01/01 starting at week 1
 	return Math.floor(doy / 7);
 }
 
 test('callbacks', function() {
 	// Before show
-	var inp = init('#inp', {beforeShow: beforeAll});
-	var inst = $.data(inp[0], 'datepicker');
+	var dp, day20, day21,
+		inp = init('#inp', {beforeShow: beforeAll}),
+		inst = $.data(inp[0], 'datepicker');
 	equal($.datepicker._get(inst, 'currentText'), 'Today', 'Before show - initial');
 	inp.val('02/04/2008').datepicker('show');
 	equal($.datepicker._get(inst, 'currentText'), 'Current', 'Before show - changed');
-	ok(beforeShowThis.id == inp[0].id, 'Before show - this OK');
-	ok(beforeShowInput.id == inp[0].id, 'Before show - input OK');
+	ok(beforeShowThis.id === inp[0].id, 'Before show - this OK');
+	ok(beforeShowInput.id === inp[0].id, 'Before show - input OK');
 	deepEqual(beforeShowInst, inst, 'Before show - inst OK');
 	inp.datepicker('hide').datepicker('destroy');
 	// Before show day
 	inp = init('#inp', {beforeShowDay: beforeDay});
-	var dp = $('#ui-datepicker-div');
+	dp = $('#ui-datepicker-div');
 	inp.val('02/04/2008').datepicker('show');
-	ok(beforeShowDayThis.id == inp[0].id, 'Before show day - this OK');
+	ok(beforeShowDayThis.id === inp[0].id, 'Before show day - this OK');
 	ok(beforeShowDayOK, 'Before show day - dates OK');
-	var day20 = dp.find('.ui-datepicker-calendar td:contains("20")');
-	var day21 = dp.find('.ui-datepicker-calendar td:contains("21")');
+	day20 = dp.find('.ui-datepicker-calendar td:contains("20")');
+	day21 = dp.find('.ui-datepicker-calendar td:contains("21")');
 	ok(!day20.is('.ui-datepicker-unselectable'), 'Before show day - unselectable 20');
 	ok(day21.is('.ui-datepicker-unselectable'), 'Before show day - unselectable 21');
 	ok(day20.is('.day10'), 'Before show day - CSS 20');
 	ok(!day21.is('.day10'), 'Before show day - CSS 21');
 	ok(!day20.attr('title'), 'Before show day - title 20');
-	ok(day21.attr('title') == 'Divisble by 3', 'Before show day - title 21');
+	ok(day21.attr('title') === 'Divisble by 3', 'Before show day - title 21');
 	inp.datepicker('hide').datepicker('destroy');
 });
 
 test('localisation', function() {
-	var inp = init('#inp', $.datepicker.regional['fr']);
+	var dp, month, day, date,
+		inp = init('#inp', $.datepicker.regional.fr);
 	inp.datepicker('option', {dateFormat: 'DD, d MM yy', showButtonPanel:true, changeMonth:true, changeYear:true}).val('').datepicker('show');
-	var dp = $('#ui-datepicker-div');
+	dp = $('#ui-datepicker-div');
 	equal($('.ui-datepicker-close', dp).text(), 'Fermer', 'Localisation - close');
 	$('.ui-datepicker-close', dp).simulate('mouseover');
 	equal($('.ui-datepicker-prev', dp).text(), 'Précédent', 'Localisation - previous');
 	equal($('.ui-datepicker-current', dp).text(), 'Aujourd\'hui', 'Localisation - current');
 	equal($('.ui-datepicker-next', dp).text(), 'Suivant', 'Localisation - next');
-	var month = 0;
+	month = 0;
 	$('.ui-datepicker-month option', dp).each(function() {
-		equal($(this).text(), $.datepicker.regional['fr'].monthNamesShort[month],
+		equal($(this).text(), $.datepicker.regional.fr.monthNamesShort[month],
 			'Localisation - month ' + month);
 		month++;
 	});
-	var day = 1;
+	day = 1;
 	$('.ui-datepicker-calendar th', dp).each(function() {
-		equal($(this).text(), $.datepicker.regional['fr'].dayNamesMin[day],
+		equal($(this).text(), $.datepicker.regional.fr.dayNamesMin[day],
 			'Localisation - day ' + day);
 		day = (day + 1) % 7;
 	});
 	inp.simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	var date = new Date();
-	equal(inp.val(), $.datepicker.regional['fr'].dayNames[date.getDay()] + ', ' +
-		date.getDate() + ' ' + $.datepicker.regional['fr'].monthNames[date.getMonth()] +
+	date = new Date();
+	equal(inp.val(), $.datepicker.regional.fr.dayNames[date.getDay()] + ', ' +
+		date.getDate() + ' ' + $.datepicker.regional.fr.monthNames[date.getMonth()] +
 		' ' + date.getFullYear(), 'Localisation - formatting');
 });
 
 test('noWeekends', function() {
-	for (var i = 1; i <= 31; i++) {
-		var date = new Date(2001, 1 - 1, i);
+	var i, date;
+	for (i = 1; i <= 31; i++) {
+		date = new Date(2001, 1 - 1, i);
 		deepEqual($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ''],
 			'No weekends ' + date);
 	}
@@ -769,6 +759,7 @@ test('iso8601Week', function() {
 
 test('parseDate', function() {
 	init('#inp');
+	var currentYear, gmtDate, fr, settings, zh;
 	ok($.datepicker.parseDate('d m y', '') == null, 'Parse date empty');
 	equalsDate($.datepicker.parseDate('d m y', '3 2 01'),
 		new Date(2001, 2 - 1, 3), 'Parse date d m y');
@@ -793,7 +784,7 @@ test('parseDate', function() {
 	equalsDate($.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
 		'day 3 of February (\'Saturday\'), 2001'), new Date(2001, 2 - 1, 3),
 		'Parse date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
-	var currentYear = new Date().getFullYear();
+	currentYear = new Date().getFullYear();
 	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000) + '-02-03'),
 			new Date(currentYear, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
 	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 10) + '-02-03'),
@@ -808,12 +799,12 @@ test('parseDate', function() {
 			new Date(currentYear + 60, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
 	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 61) + '-02-03', {shortYearCutoff: '+60'}),
 			new Date(currentYear - 39, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
-	var gmtDate = new Date(2001, 2 - 1, 3);
+	gmtDate = new Date(2001, 2 - 1, 3);
 	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
 	equalsDate($.datepicker.parseDate('@', '981158400000'), gmtDate, 'Parse date @');
 	equalsDate($.datepicker.parseDate('!', '631167552000000000'), gmtDate, 'Parse date !');
-	var fr = $.datepicker.regional['fr'];
-	var settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+	fr = $.datepicker.regional.fr;
+	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
 		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
 	equalsDate($.datepicker.parseDate('D d M y', 'Lun. 9 Avril 01', settings),
 		new Date(2001, 4 - 1, 9), 'Parse date D M y with settings');
@@ -825,14 +816,15 @@ test('parseDate', function() {
 		'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'];
+	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() {
 	init('#inp');
-	var expectError = function(expr, value, error) {
+	var fr, settings;
+	function expectError(expr, value, error) {
 		try {
 			expr();
 			ok(false, 'Parsed error ' + value);
@@ -840,7 +832,7 @@ test('parseDateErrors', function() {
 		catch (e) {
 			equal(e, error, 'Parsed error ' + value);
 		}
-	};
+	}
 	expectError(function() { $.datepicker.parseDate(null, 'Sat 2 01'); },
 		'Sat 2 01', 'Invalid arguments');
 	expectError(function() { $.datepicker.parseDate('d m y', null); },
@@ -872,8 +864,8 @@ test('parseDateErrors', function() {
 		'day 3 of Mon2 ("Day7"), 2001', 'Unexpected literal at position 19');
 	expectError(function() { $.datepicker.parseDate('d m y', '29 2 01'); },
 		'29 2 01 - d m y', 'Invalid date');
-	var fr = $.datepicker.regional['fr'];
-	var settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+	fr = $.datepicker.regional.fr;
+	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
 		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
 	expectError(function() { $.datepicker.parseDate('D d M y', 'Mon 9 Avr 01', settings); },
 		'Mon 9 Avr 01 - D d M y', 'Unknown name at position 0');
@@ -883,6 +875,7 @@ test('parseDateErrors', function() {
 
 test('formatDate', function() {
 	init('#inp');
+	var gmtDate, fr, settings;
 	equal($.datepicker.formatDate('d m y', new Date(2001, 2 - 1, 3)),
 		'3 2 01', 'Format date d m y');
 	equal($.datepicker.formatDate('dd mm yy', new Date(2001, 2 - 1, 3)),
@@ -904,12 +897,12 @@ test('formatDate', function() {
 	equal($.datepicker.formatDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
 		new Date(2001, 2 - 1, 3)), 'day 3 of February (\'Saturday\'), 2001',
 		'Format date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
-	var gmtDate = new Date(2001, 2 - 1, 3);
+	gmtDate = new Date(2001, 2 - 1, 3);
 	gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
 	equal($.datepicker.formatDate('@', gmtDate), '981158400000', 'Format date @');
 	equal($.datepicker.formatDate('!', gmtDate), '631167552000000000', 'Format date !');
-	var fr = $.datepicker.regional['fr'];
-	var settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
+	fr = $.datepicker.regional.fr;
+	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
 		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
 	equal($.datepicker.formatDate('D M y', new Date(2001, 4 - 1, 9), settings),
 		'Lun. Avril 01', 'Format date D M y with settings');
diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js
index fcf712370..105be63a6 100644
--- a/tests/unit/datepicker/datepicker_tickets.js
+++ b/tests/unit/datepicker/datepicker_tickets.js
@@ -7,8 +7,8 @@ module("datepicker: tickets");
 
 // http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1
 test('beforeShowDay-getDate', function() {
-	var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }});
-	var dp = $('#ui-datepicker-div');
+	var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}),
+	   dp = $('#ui-datepicker-div');
 	inp.val('01/01/2010').datepicker('show');
 	// contains non-breaking space
 	equal($('div.ui-datepicker-title').text(), 'January 2010', 'Initial month');
@@ -26,11 +26,11 @@ test('beforeShowDay-getDate', function() {
 
 test('Ticket 7602: Stop datepicker from appearing with beforeShow event handler', function(){
     var inp = init('#inp',{
-        beforeShow: function(){
-            return false;
-        }
-    });
-	var dp = $('#ui-datepicker-div');
+            beforeShow: function(){
+                return false;
+            }
+        }),
+        dp = $('#ui-datepicker-div');
     inp.datepicker('show');
     equal(dp.css('display'), 'none',"beforeShow returns false");
     inp.datepicker('destroy');
-- 
cgit v1.2.3


From 0e8d9dde20e6bb4481fbfa94a2066125179066b0 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 11:21:24 -0400
Subject: Tests: Lint.

---
 grunt.js                           |  9 +++++----
 tests/unit/widget/widget_extend.js | 17 ++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 07bd7a6ed..a2f47ae51 100644
--- a/grunt.js
+++ b/grunt.js
@@ -271,9 +271,8 @@ grunt.initConfig({
 			// TODO remove items from this list once rewritten
 			return !( /(effects.core|mouse|datepicker|draggable|droppable|resizable|selectable|sortable)\.js$/ ).test( file );
 		}),
-		grunt: "grunt.js"
-		// TODO enabled once fixed up
-		// tests: "tests/unit/**/*.js"
+		grunt: "grunt.js",
+		tests: "tests/unit/**/*.js"
 	},
 	csslint: {
 		// nothing: []
@@ -343,7 +342,9 @@ grunt.initConfig({
 			tests: {
 				options: extend({
 					browser: true,
-					jquery: true
+					jquery: true,
+					// TODO: this is only for document.write()
+					evil: true
 				}, defaults ),
 				// TODO: don't create so many globals in tests
 				globals: {
diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/widget_extend.js
index 36cd999dd..ae9855929 100644
--- a/tests/unit/widget/widget_extend.js
+++ b/tests/unit/widget/widget_extend.js
@@ -12,7 +12,14 @@ test( "$.widget.extend()", function() {
 		deep2copy = { foo: { baz: true }, foo2: document },
 		deepmerged = { foo: { bar: true, baz: true }, foo2: document },
 		arr = [1, 2, 3],
-		nestedarray = { arr: arr };
+		nestedarray = { arr: arr },
+		defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+		options1 = { xnumber2: 1, xstring2: "x" },
+		options1Copy = { xnumber2: 1, xstring2: "x" },
+		options2 = { xstring2: "xx", xxx: "newstringx" },
+		options2Copy = { xstring2: "xx", xxx: "newstringx" },
+		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
 
 	$.widget.extend( settings, options );
 	deepEqual( settings, merged, "Check if extended: settings must be extended" );
@@ -79,14 +86,6 @@ test( "$.widget.extend()", function() {
 	$.widget.extend( obj, { foo:"notnull" } );
 	equal( obj.foo, "notnull", "Make sure a null value can be overwritten" );
 
-	var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options1 = { xnumber2: 1, xstring2: "x" },
-		options1Copy = { xnumber2: 1, xstring2: "x" },
-		options2 = { xstring2: "xx", xxx: "newstringx" },
-		options2Copy = { xstring2: "xx", xxx: "newstringx" },
-		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
-
 	settings = $.widget.extend( {}, defaults, options1, options2 );
 	deepEqual( settings, merged2, "Check if extended: settings must be extended" );
 	deepEqual( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
-- 
cgit v1.2.3


From 163555d7bf27fe5d272e404de3c4439902710f54 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 11:37:33 -0400
Subject: Accordion tests: Don't polloute the global namespace with helpers.

---
 grunt.js                                       |  4 +-
 tests/unit/accordion/accordion_core.js         |  7 +-
 tests/unit/accordion/accordion_deprecated.js   | 94 ++++++++++++++------------
 tests/unit/accordion/accordion_events.js       | 21 +++---
 tests/unit/accordion/accordion_methods.js      | 18 +++--
 tests/unit/accordion/accordion_options.js      | 74 ++++++++++----------
 tests/unit/accordion/accordion_test_helpers.js | 58 ++++++++--------
 tests/unit/testsuite.js                        |  2 +
 8 files changed, 149 insertions(+), 129 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index a2f47ae51..78303180d 100644
--- a/grunt.js
+++ b/grunt.js
@@ -348,9 +348,6 @@ grunt.initConfig({
 				}, defaults ),
 				// TODO: don't create so many globals in tests
 				globals: {
-					accordion_equalHeights: true,
-					accordion_setupTeardown: true,
-					accordion_state: true,
 					addMonths: true,
 					asyncTest: true,
 					commonWidgetTests: true,
@@ -396,6 +393,7 @@ grunt.initConfig({
 					tabs_state: true,
 					tabs_disabled: true,
 					test: true,
+					TestHelpers: true,
 					widthAfter: true
 				}
 			}
diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index b08a5caea..7a1d56c18 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -1,6 +1,9 @@
 (function( $ ) {
 
-module( "accordion: core", accordion_setupTeardown() );
+var setupTeardown = TestHelpers.accordion.setupTeardown,
+	state = TestHelpers.accordion.state;
+
+module( "accordion: core", setupTeardown() );
 
 $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
 	test( "markup structure: " + type, function() {
@@ -21,7 +24,7 @@ test( "handle click on header-descendant", function() {
 	expect( 1 );
 	var element = $( "#navigation" ).accordion();
 	$( "#navigation h2:eq(1) a" ).click();
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "accessibility", function () {
diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
index 47180e785..8d8e8a0d6 100644
--- a/tests/unit/accordion/accordion_deprecated.js
+++ b/tests/unit/accordion/accordion_deprecated.js
@@ -1,70 +1,74 @@
 (function( $ ) {
 
-module( "accordion (deprecated): expanded active option, activate method", accordion_setupTeardown() );
+var equalHeights = TestHelpers.accordion.equalHeights,
+	setupTeardown = TestHelpers.accordion.setupTeardown,
+	state = TestHelpers.accordion.state;
+
+module( "accordion (deprecated): expanded active option, activate method", setupTeardown() );
 
 test( "activate, numeric", function() {
 	expect( 5 );
 	var element = $( "#list1" ).accordion({ active: 1 });
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 	element.accordion( "activate", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "activate", 0 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.accordion( "activate", 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 	element.accordion( "activate", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 test( "activate, numeric, collapsible:true", function() {
 	expect( 3 );
 	var element = $( "#list1" ).accordion({ collapsible: true });
 	element.accordion( "activate", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "activate", 0 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.accordion( "activate", -1 );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "activate, boolean, collapsible: true", function() {
 	expect( 2 );
 	var element = $( "#list1" ).accordion({ collapsible: true });
 	element.accordion( "activate", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "activate", false );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "activate, boolean, collapsible: false", function() {
 	expect( 2 );
 	var element = $( "#list1" ).accordion();
 	element.accordion( "activate", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "activate", false );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 test( "activate, string expression", function() {
 	expect( 4 );
 	var element = $( "#list1" ).accordion({ active: "h3:last" });
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "activate", ":first" );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.accordion( "activate", ":eq(1)" );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 	element.accordion( "activate", ":last" );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 test( "activate, jQuery or DOM element", function() {
 	expect( 3 );
 	var element = $( "#list1" ).accordion({ active: $( "#list1 h3:last" ) });
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "activate", $( "#list1 h3:first" ) );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.accordion( "activate", $( "#list1 h3" )[ 1 ] );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ active: Selector }", function() {
@@ -72,9 +76,9 @@ test( "{ active: Selector }", function() {
 	var element = $("#list1").accordion({
 		active: "h3:last"
 	});
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "option", "active", "h3:eq(1)" );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ active: Element }", function() {
@@ -82,9 +86,9 @@ test( "{ active: Element }", function() {
 	var element = $( "#list1" ).accordion({
 		active: $( "#list1 h3:last" )[ 0 ]
 	});
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "option", "active", $( "#list1 h3:eq(1)" )[ 0 ] );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ active: jQuery Object }", function() {
@@ -92,20 +96,20 @@ test( "{ active: jQuery Object }", function() {
 	var element = $( "#list1" ).accordion({
 		active: $( "#list1 h3:last" )
 	});
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.accordion( "option", "active", $( "#list1 h3:eq(1)" ) );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 
 
 
 
-module( "accordion (deprecated) - height options", accordion_setupTeardown() );
+module( "accordion (deprecated) - height options", setupTeardown() );
 
 test( "{ autoHeight: true }, default", function() {
 	expect( 3 );
-	accordion_equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
+	equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
 });
 
 test( "{ autoHeight: false }", function() {
@@ -124,7 +128,7 @@ test( "{ fillSpace: true }", function() {
 	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	var element = $( "#navigation" ).accordion({ fillSpace: true });
-	accordion_equalHeights( element, 446, 458 );
+	equalHeights( element, 446, 458 );
 });
 
 test( "{ fillSapce: true } with sibling", function() {
@@ -138,7 +142,7 @@ test( "{ fillSapce: true } with sibling", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ fillSpace: true });
-	accordion_equalHeights( element , 346, 358);
+	equalHeights( element , 346, 358);
 });
 
 test( "{ fillSpace: true } with multiple siblings", function() {
@@ -167,14 +171,14 @@ test( "{ fillSpace: true } with multiple siblings", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ fillSpace: true });
-	accordion_equalHeights( element, 296, 308 );
+	equalHeights( element, 296, 308 );
 });
 
 
 
 
 
-module( "accordion (deprecated) - icons", accordion_setupTeardown() );
+module( "accordion (deprecated) - icons", setupTeardown() );
 
 test( "icons, headerSelected", function() {
 	expect( 3 );
@@ -191,7 +195,7 @@ test( "icons, headerSelected", function() {
 
 
 
-module( "accordion (deprecated) - resize", accordion_setupTeardown() );
+module( "accordion (deprecated) - resize", setupTeardown() );
 
 test( "resize", function() {
 	expect( 6 );
@@ -202,18 +206,18 @@ test( "resize", function() {
 		.accordion({
 			heightStyle: "fill"
 		});
-	accordion_equalHeights( element, 246, 258 );
+	equalHeights( element, 246, 258 );
 
 	element.parent().height( 500 );
 	element.accordion( "resize" );
-	accordion_equalHeights( element, 446, 458 );
+	equalHeights( element, 446, 458 );
 });
 
 
 
 
 
-module( "accordion (deprecated) - navigation", accordion_setupTeardown() );
+module( "accordion (deprecated) - navigation", setupTeardown() );
 
 test( "{ navigation: true, navigationFilter: header }", function() {
 	expect( 2 );
@@ -224,7 +228,7 @@ test( "{ navigation: true, navigationFilter: header }", function() {
 		}
 	});
 	equal( element.accordion( "option", "active" ), 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 test( "{ navigation: true, navigationFilter: content }", function() {
@@ -236,14 +240,14 @@ test( "{ navigation: true, navigationFilter: content }", function() {
 		}
 	});
 	equal( element.accordion( "option", "active" ), 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 
 
 
 
-module( "accordion (deprecated) - changestart/change events", accordion_setupTeardown() );
+module( "accordion (deprecated) - changestart/change events", setupTeardown() );
 
 test( "changestart", function() {
 	expect( 26 );
@@ -261,10 +265,10 @@ test( "changestart", function() {
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
 		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
-		accordion_state( element, 0, 0, 0 );
+		state( element, 0, 0, 0 );
 	});
 	element.accordion( "option", "active", 0 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.one( "accordionchangestart", function( event, ui ) {
 		equal( ui.oldHeader.size(), 1 );
@@ -275,10 +279,10 @@ test( "changestart", function() {
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
 		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
-		accordion_state( element, 1, 0, 0 );
+		state( element, 1, 0, 0 );
 	});
 	headers.eq( 1 ).click();
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.one( "accordionchangestart", function( event, ui ) {
 		equal( ui.oldHeader.size(), 1 );
@@ -287,10 +291,10 @@ test( "changestart", function() {
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
 		equal( ui.newHeader.size(), 0 );
 		equal( ui.newContent.size(), 0 );
-		accordion_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "change", function() {
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 7e3d1f8d0..932e4637d 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -1,6 +1,9 @@
 (function( $ ) {
 
-module( "accordion: events", accordion_setupTeardown() );
+var setupTeardown = TestHelpers.accordion.setupTeardown,
+	state = TestHelpers.accordion.state;
+
+module( "accordion: events", setupTeardown() );
 
 test( "create", function() {
 	expect( 10 );
@@ -58,10 +61,10 @@ test( "beforeActivate", function() {
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
 		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
-		accordion_state( element, 0, 0, 0 );
+		state( element, 0, 0, 0 );
 	});
 	element.accordion( "option", "active", 0 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		equal( event.originalEvent.type, "click" );
@@ -73,10 +76,10 @@ test( "beforeActivate", function() {
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
 		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
-		accordion_state( element, 1, 0, 0 );
+		state( element, 1, 0, 0 );
 	});
 	headers.eq( 1 ).click();
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
@@ -86,10 +89,10 @@ test( "beforeActivate", function() {
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
 		equal( ui.newHeader.size(), 0 );
 		equal( ui.newContent.size(), 0 );
-		accordion_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
@@ -100,10 +103,10 @@ test( "beforeActivate", function() {
 		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 2 ] );
 		event.preventDefault();
-		accordion_state( element, 0, 0, 0 );
+		state( element, 0, 0, 0 );
 	});
 	element.accordion( "option", "active", 2 );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "activate", function() {
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
index 2f4722070..2c5b36632 100644
--- a/tests/unit/accordion/accordion_methods.js
+++ b/tests/unit/accordion/accordion_methods.js
@@ -1,6 +1,10 @@
 (function( $ ) {
 
-module( "accordion: methods", accordion_setupTeardown() );
+var equalHeights = TestHelpers.accordion.equalHeights,
+	setupTeardown = TestHelpers.accordion.setupTeardown,
+	state = TestHelpers.accordion.state;
+
+module( "accordion: methods", setupTeardown() );
 
 test( "destroy", function() {
 	expect( 1 );
@@ -12,17 +16,17 @@ test( "destroy", function() {
 test( "enable/disable", function() {
 	expect( 4 );
 	var element = $( "#list1" ).accordion();
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.accordion( "disable" );
 	// event does nothing
 	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	// option still works
 	element.accordion( "option", "active", 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 	element.accordion( "enable" );
 	element.accordion( "option", "active", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 test( "refresh", function() {
@@ -34,11 +38,11 @@ test( "refresh", function() {
 		.accordion({
 			heightStyle: "fill"
 		});
-	accordion_equalHeights( element, 246, 258 );
+	equalHeights( element, 246, 258 );
 
 	element.parent().height( 500 );
 	element.accordion( "refresh" );
-	accordion_equalHeights( element, 446, 458 );
+	equalHeights( element, 446, 458 );
 });
 
 }( jQuery ) );
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index a29c7f07d..f64ddc675 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -1,12 +1,16 @@
 (function( $ ) {
 
-module( "accordion: options", accordion_setupTeardown() );
+var equalHeights = TestHelpers.accordion.equalHeights,
+	setupTeardown = TestHelpers.accordion.setupTeardown,
+	state = TestHelpers.accordion.state;
+
+module( "accordion: options", setupTeardown() );
 
 test( "{ active: default }", function() {
 	expect( 2 );
 	var element = $( "#list1" ).accordion();
 	equal( element.accordion( "option", "active" ), 0 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 });
 
 test( "{ active: false }", function() {
@@ -15,19 +19,19 @@ test( "{ active: false }", function() {
 		active: false,
 		collapsible: true
 	});
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 	equal( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
 	equal( element.accordion( "option", "active" ), false );
 
 	element.accordion( "option", "collapsible", false );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	equal( element.accordion( "option", "active" ), 0 );
 
 	element.accordion( "destroy" );
 	element.accordion({
 		active: false
 	});
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	strictEqual( element.accordion( "option", "active" ), 0 );
 });
 
@@ -37,19 +41,19 @@ test( "{ active: Number }", function() {
 		active: 2
 	});
 	equal( element.accordion( "option", "active" ), 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 
 	element.accordion( "option", "active", 0 );
 	equal( element.accordion( "option", "active" ), 0 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).click();
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.accordion( "option", "active", 10 );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 if ( $.uiBackCompat === false ) {
@@ -59,19 +63,19 @@ if ( $.uiBackCompat === false ) {
 			active: -1
 		});
 		equal( element.accordion( "option", "active" ), 2 );
-		accordion_state( element, 0, 0, 1 );
+		state( element, 0, 0, 1 );
 
 		element.accordion( "option", "active", -2 );
 		equal( element.accordion( "option", "active" ), 1 );
-		accordion_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 
 		element.accordion( "option", "active", -10 );
 		equal( element.accordion( "option", "active" ), 1 );
-		accordion_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 
 		element.accordion( "option", "active", -3 );
 		equal( element.accordion( "option", "active" ), 0 );
-		accordion_state( element, 1, 0, 0 );
+		state( element, 1, 0, 0 );
 	});
 }
 
@@ -252,11 +256,11 @@ test( "{ collapsible: false }", function() {
 	});
 	element.accordion( "option", "active", false );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).click();
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ collapsible: true }", function() {
@@ -268,15 +272,15 @@ test( "{ collapsible: true }", function() {
 
 	element.accordion( "option", "active", false );
 	equal( element.accordion( "option", "active" ), false );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 
 	element.accordion( "option", "active", 1 );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).click();
 	equal( element.accordion( "option", "active" ), false );
-	accordion_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "{ event: null }", function() {
@@ -284,16 +288,16 @@ test( "{ event: null }", function() {
 	var element = $( "#list1" ).accordion({
 		event: null
 	});
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.accordion( "option", "active", 1 );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	// ensure default click handler isn't bound
 	element.find( ".ui-accordion-header" ).eq( 2 ).click();
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ event: custom }", function() {
@@ -301,20 +305,20 @@ test( "{ event: custom }", function() {
 	var element = $( "#list1" ).accordion({
 		event: "custom1 custom2"
 	});
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	// ensure default click handler isn't bound
 	element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "click" );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "custom2" );
 	equal( element.accordion( "option", "active" ), 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 
 	element.accordion( "option", "event", "custom3" );
 
@@ -322,20 +326,20 @@ test( "{ event: custom }", function() {
 	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
 	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom2" );
 	equal( element.accordion( "option", "active" ), 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom3" );
 	equal( element.accordion( "option", "active" ), 1 );
-	accordion_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ header: default }", function() {
 	expect( 2 );
 	// default: > li > :first-child,> :not(li):even
 	// > :not(li):even
-	accordion_state( $( "#list1" ).accordion(), 1, 0, 0);
+	state( $( "#list1" ).accordion(), 1, 0, 0);
 	// > li > :first-child
-	accordion_state( $( "#navigation" ).accordion(), 1, 0, 0);
+	state( $( "#navigation" ).accordion(), 1, 0, 0);
 });
 
 test( "{ header: custom }", function() {
@@ -347,15 +351,15 @@ test( "{ header: custom }", function() {
 		ok( $( this ).hasClass( "ui-accordion-header" ) );
 	});
 	equal( element.find( ".ui-accordion-header" ).length, 3 );
-	accordion_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.accordion( "option", "active", 2 );
-	accordion_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 });
 
 test( "{ heightStyle: 'auto' }", function() {
 	expect( 3 );
 	var element = $( "#navigation" ).accordion({ heightStyle: "auto" });
-	accordion_equalHeights( element, 95, 130 );
+	equalHeights( element, 95, 130 );
 });
 
 test( "{ heightStyle: 'content' }", function() {
@@ -373,7 +377,7 @@ test( "{ heightStyle: 'fill' }", function() {
 	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	accordion_equalHeights( element, 446, 458 );
+	equalHeights( element, 446, 458 );
 });
 
 test( "{ heightStyle: 'fill' } with sibling", function() {
@@ -387,7 +391,7 @@ test( "{ heightStyle: 'fill' } with sibling", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	accordion_equalHeights( element , 346, 358);
+	equalHeights( element , 346, 358);
 });
 
 test( "{ heightStyle: 'fill' } with multiple siblings", function() {
@@ -416,7 +420,7 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	accordion_equalHeights( element, 296, 308 );
+	equalHeights( element, 296, 308 );
 });
 
 test( "{ icons: false }", function() {
diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/accordion_test_helpers.js
index 889608fba..56967793d 100644
--- a/tests/unit/accordion/accordion_test_helpers.js
+++ b/tests/unit/accordion/accordion_test_helpers.js
@@ -1,30 +1,32 @@
-function accordion_state( accordion ) {
-	var expected = $.makeArray( arguments ).slice( 1 ),
-		actual = accordion.find( ".ui-accordion-content" ).map(function() {
-		return $( this ).css( "display" ) === "none" ? 0 : 1;
-	}).get();
-	QUnit.push( QUnit.equiv(actual, expected), actual, expected );
-}
+TestHelpers.accordion = {
+	equalHeights: function( accordion, min, max ) {
+		var sizes = [];
+		accordion.find( ".ui-accordion-content" ).each(function() {
+			sizes.push( $( this ).outerHeight() );
+		});
+		ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
+			"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
+		deepEqual( sizes[ 0 ], sizes[ 1 ] );
+		deepEqual( sizes[ 0 ], sizes[ 2 ] );
+	},
 
-function accordion_equalHeights( accordion, min, max ) {
-	var sizes = [];
-	accordion.find( ".ui-accordion-content" ).each(function() {
-		sizes.push( $( this ).outerHeight() );
-	});
-	ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
-		"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
-	deepEqual( sizes[ 0 ], sizes[ 1 ] );
-	deepEqual( sizes[ 0 ], sizes[ 2 ] );
-}
+	setupTeardown: function() {
+		var animate = $.ui.accordion.prototype.options.animate;
+		return {
+			setup: function() {
+				$.ui.accordion.prototype.options.animate = false;
+			},
+			teardown: function() {
+				$.ui.accordion.prototype.options.animate = animate;
+			}
+		};
+	},
 
-function accordion_setupTeardown() {
-	var animate = $.ui.accordion.prototype.options.animate;
-	return {
-		setup: function() {
-			$.ui.accordion.prototype.options.animate = false;
-		},
-		teardown: function() {
-			$.ui.accordion.prototype.options.animate = animate;
-		}
-	};
-}
+	state: function( accordion ) {
+		var expected = $.makeArray( arguments ).slice( 1 ),
+			actual = accordion.find( ".ui-accordion-content" ).map(function() {
+			return $( this ).css( "display" ) === "none" ? 0 : 1;
+		}).get();
+		QUnit.push( QUnit.equiv(actual, expected), actual, expected );
+	}
+};
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 2ef6bf472..648b302ee 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -1,5 +1,7 @@
 (function() {
 
+window.TestHelpers = {};
+
 function testWidgetDefaults( widget, defaults ) {
 	var pluginDefaults = $.ui[ widget ].prototype.options;
 
-- 
cgit v1.2.3


From c16bd7c510cff4e0b01d9c191128af014523da7c Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Thu, 19 Apr 2012 11:19:52 -0500
Subject: Menu tests: Don't pollute the global namespace with helpers.

---
 grunt.js                             |   2 -
 tests/unit/menu/menu_events.js       | 175 ++++++++++++++++++-----------------
 tests/unit/menu/menu_methods.js      |  17 ++--
 tests/unit/menu/menu_options.js      |  19 ++--
 tests/unit/menu/menu_test_helpers.js |  28 +++---
 5 files changed, 125 insertions(+), 116 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 78303180d..33ae33829 100644
--- a/grunt.js
+++ b/grunt.js
@@ -368,8 +368,6 @@ grunt.initConfig({
 					init: true,
 					isNotOpen: true,
 					isOpen: true,
-					menu_click: true,
-					menu_log: true,
 					modal: true,
 					module: true,
 					moved: true,
diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index dccb5f7a2..a0051c70b 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -3,21 +3,24 @@
  */
 (function($) {
 
+var log = TestHelpers.menu.log,
+	click = TestHelpers.menu.click;
+
 module("menu: events");
 
 test("handle click on menu", function() {
 	expect(1);
 	var menu = $('#menu1').menu({
 		select: function(event, ui) {
-			menu_log();
+			log();
 		}
 	});
-	menu_log("click",true);
-	menu_click($('#menu1'),"1");
-	menu_log("afterclick");
-	menu_click( menu,"2");
-	menu_click($('#menu1'),"3");
-	menu_click( menu,"1");
+	log("click",true);
+	click($('#menu1'),"1");
+	log("afterclick");
+	click( menu,"2");
+	click($('#menu1'),"3");
+	click( menu,"1");
 	equal( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
 });
 
@@ -25,16 +28,16 @@ test("handle click on custom item menu", function() {
 	expect(1);
 	var menu = $('#menu5').menu({
 		select: function(event, ui) {
-			menu_log();
+			log();
 		},
 		menus: "div"
 	});
-	menu_log("click",true);
-	menu_click($('#menu5'),"1");
-	menu_log("afterclick");
-	menu_click( menu,"2");
-	menu_click($('#menu5'),"3");
-	menu_click( menu,"1");
+	log("click",true);
+	click($('#menu5'),"1");
+	log("afterclick");
+	click( menu,"2");
+	click($('#menu5'),"3");
+	click( menu,"1");
 	equal( $("#log").html(), "1,3,2,afterclick,1,click,", "Click order not valid.");
 });
 
@@ -75,7 +78,7 @@ test( "handle blur on custom item menu: click", function() {
 		items: "div"
 	});
 
-	menu_click($('#menu5'),"1");
+	click($('#menu5'),"1");
 	$( "<a>", { id: "remove"} ).appendTo("body").trigger( "click" );
 
 	$("#remove").remove();
@@ -144,60 +147,60 @@ test("handle keyboard navigation on menu without scroll and without submenus", f
 	expect(12);
 	var element = $('#menu1').menu({
 		select: function(event, ui) {
-			menu_log($(ui.item[0]).text());
+			log($(ui.item[0]).text());
 		},
 		focus: function( event, ui ) {
-			menu_log($(event.target).find(".ui-state-focus").parent().index());
+			log($(event.target).find(".ui-state-focus").parent().index());
 		}
 	});
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	equal( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	equal( $("#log").html(), "1,keydown,", "Keydown UP");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 	equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 	equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 	equal( $("#log").html(), "4,keydown,", "Keydown PAGE_DOWN");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 	equal( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 	equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 	equal( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
 	equal( $("#log").html(), "4,keydown,", "Keydown END");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
 	equal( $("#log").html(), "0,keydown,", "Keydown HOME");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 	equal( $("#log").html(), "keydown,", "Keydown ESCAPE (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	equal( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER");
 });
@@ -206,14 +209,14 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	expect(14);
 	var element = $('#menu2').menu({
 		select: function(event, ui) {
-			menu_log($(ui.item[0]).text());
+			log($(ui.item[0]).text());
 		},
 		focus: function( event, ui ) {
-			menu_log($(event.target).find(".ui-state-focus").parent().index());
+			log($(event.target).find(".ui-state-focus").parent().index());
 		}
 	});
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -223,16 +226,16 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	element.focus();
 
 	function menukeyboard1() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		equal( $("#log").html(), "0,1,keydown,", "Keydown UP");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -246,7 +249,7 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	}
 
 	function menukeyboard2() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equal( $("#log").html(), "4,keydown,", "Keydown LEFT (close submenu)");
 
@@ -256,35 +259,35 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	}
 
 	function menukeyboard3() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 		equal( $("#log").html(), "2,keydown,", "Keydown PAGE_DOWN");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 		equal( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 		equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 		equal( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
 		equal( $("#log").html(), "2,keydown,", "Keydown END");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
 		equal( $("#log").html(), "0,keydown,", "Keydown HOME");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 		equal( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		setTimeout( menukeyboard4, 50 );
 	}
@@ -292,7 +295,7 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
 	function menukeyboard4() {
 		equal( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		equal( $("#log").html(), "Ada,keydown,", "Keydown ENTER (select item)");
 
@@ -304,69 +307,69 @@ test("handle keyboard navigation on menu with scroll and without submenus", func
 	expect(14);
 	var element = $('#menu3').menu({
 		select: function(event, ui) {
-			menu_log($(ui.item[0]).text());
+			log($(ui.item[0]).text());
 		},
 		focus: function( event, ui ) {
-			menu_log($(event.target).find(".ui-state-focus").parent().index());
+			log($(event.target).find(".ui-state-focus").parent().index());
 		}
 	});
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.focus();
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 	equal( $("#log").html(), "2,1,0,keydown,", "Keydown DOWN");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 	equal( $("#log").html(), "0,1,keydown,", "Keydown UP");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 	equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 	equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 	equal( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 	equal( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 	equal( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 	equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 	equal( $("#log").html(), "keydown,", "Keydown PAGE_UP (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
 	equal( $("#log").html(), "37,keydown,", "Keydown END");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 	equal( $("#log").html(), "keydown,", "Keydown PAGE_DOWN (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
 	equal( $("#log").html(), "0,keydown,", "Keydown HOME");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 	equal( $("#log").html(), "keydown,", "Keydown ESCAPE (no effect)");
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 	equal( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER");
 });
@@ -375,14 +378,14 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 	expect(14);
 	var element = $('#menu4').menu({
 		select: function(event, ui) {
-			menu_log($(ui.item[0]).text());
+			log($(ui.item[0]).text());
 		},
 		focus: function( event, ui ) {
-			menu_log($(event.target).find(".ui-state-focus").parent().index());
+			log($(event.target).find(".ui-state-focus").parent().index());
 		}
 	});
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -393,16 +396,16 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 
 
 	function menukeyboard1() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
 		equal( $("#log").html(), "0,1,keydown,", "Keydown UP");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
@@ -413,7 +416,7 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 	}
 
 	function menukeyboard2() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equal( $("#log").html(), "1,keydown,", "Keydown LEFT (close submenu)");
 
@@ -423,35 +426,35 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 	}
 
 	function menukeyboard3() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 		equal( $("#log").html(), "10,keydown,", "Keydown PAGE_DOWN");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
 		equal( $("#log").html(), "20,keydown,", "Keydown PAGE_DOWN");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 		equal( $("#log").html(), "10,keydown,", "Keydown PAGE_UP");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
 		equal( $("#log").html(), "0,keydown,", "Keydown PAGE_UP");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.END } );
 		equal( $("#log").html(), "27,keydown,", "Keydown END");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.HOME } );
 		equal( $("#log").html(), "0,keydown,", "Keydown HOME");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
 		equal( $("#log").html(), "1,keydown,", "Keydown ESCAPE (close submenu)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		setTimeout( menukeyboard4, 50 );
 	}
@@ -459,7 +462,7 @@ asyncTest("handle keyboard navigation on menu with scroll and with submenus", fu
 	function menukeyboard4() {
 		equal( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 		equal( $("#log").html(), "Aberdeen,keydown,", "Keydown ENTER (select item)");
 
@@ -471,14 +474,14 @@ asyncTest("handle keyboard navigation and mouse click on menu with disabled item
 	expect(6);
 	var element = $('#menu6').menu({
 		select: function(event, ui) {
-			menu_log($(ui.item[0]).text());
+			log($(ui.item[0]).text());
 		},
 		focus: function( event, ui ) {
-			menu_log($(event.target).find(".ui-state-focus").parent().index());
+			log($(event.target).find(".ui-state-focus").parent().index());
 		}
 	});
 
-	menu_log("keydown",true);
+	log("keydown",true);
 	element.one( "menufocus", function( event, ui ) {
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
@@ -489,29 +492,29 @@ asyncTest("handle keyboard navigation and mouse click on menu with disabled item
 
 
 	function menukeyboard1() {
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 		equal( $("#log").html(), "4,3,2,keydown,", "Keydown focus disabled item with submenu");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.LEFT } );
 		equal( $("#log").html(), "keydown,", "Keydown LEFT (no effect)");
 
-		menu_log("keydown",true);
+		log("keydown",true);
 		element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
 
 		setTimeout( function() {
 			equal( $("#log").html(), "keydown,", "Keydown RIGHT (no effect on disabled sub-menu)");
 
-			menu_log("keydown",true);
+			log("keydown",true);
 			element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
 
 			setTimeout( function() {
 				equal( $("#log").html(), "keydown,", "Keydown ENTER (no effect on disabled sub-menu)");
-				menu_log("click",true);
-				menu_click( element, "1" );
+				log("click",true);
+				click( element, "1" );
 				equal( $("#log").html(), "click,", "Click disabled item (no effect)");
 				start();
 			}, 50);
diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index 200ea4427..6ad7bc134 100644
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -3,25 +3,28 @@
  */
 (function($) {
 
+var log = TestHelpers.menu.log,
+	click = TestHelpers.menu.click;
+
 module("menu: methods");
 
 test( "enable/disable", function() {
 	expect( 3 );
 	var menu = $( "#menu1" ).menu({
 		select: function(event, ui) {
-			menu_log();
+			log();
 		}
 	});
 	menu.menu("disable");
 	ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
-	menu_log("click",true);
-	menu_click(menu,"1");
-	menu_log("afterclick");
+	log("click",true);
+	click(menu,"1");
+	log("afterclick");
 	menu.menu("enable");
 	ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
-	menu_log("click");
-	menu_click(menu,"1");
-	menu_log("afterclick");
+	log("click");
+	click(menu,"1");
+	log("afterclick");
 	equal( $("#log").html(), "afterclick,1,click,afterclick,click,", "Click order not valid.");
 });
 
diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index cda52d88d..e651fd2d1 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -3,6 +3,9 @@
  */
 (function($) {
 
+var log = TestHelpers.menu.log,
+	click = TestHelpers.menu.click;
+
 module("menu: options");
 
 test( "{ disabled: true }", function() {
@@ -10,13 +13,13 @@ test( "{ disabled: true }", function() {
 	var menu = $( "#menu1" ).menu({
 		disabled: true,
 		select: function(event, ui) {
-			menu_log();
+			log();
 		}
 	});
 	ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
-	menu_log("click",true);
-	menu_click(menu,"1");
-	menu_log("afterclick");
+	log("click",true);
+	click(menu,"1");
+	log("afterclick");
 	equal( $("#log").html(), "afterclick,click,", "Click order not valid.");
 });
 
@@ -25,13 +28,13 @@ test( "{ disabled: false }", function() {
 	var menu = $( "#menu1" ).menu({
 		disabled: false,
 		select: function(event, ui) {
-			menu_log();
+			log();
 		}
 	});
 	ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
-	menu_log("click",true);
-	menu_click(menu,"1");
-	menu_log("afterclick");
+	log("click",true);
+	click(menu,"1");
+	log("afterclick");
 	equal( $("#log").html(), "afterclick,1,click,", "Click order not valid.");
 });
 
diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/menu_test_helpers.js
index e83795e5a..a576af19a 100644
--- a/tests/unit/menu/menu_test_helpers.js
+++ b/tests/unit/menu/menu_test_helpers.js
@@ -1,14 +1,16 @@
-function menu_log( message, clear ) {
-	if ( clear ) {
-		$( "#log" ).empty();
-	}
-	if ( message === undefined ) {
-		message = $( "#log" ).data( "lastItem" );
-	}
-	$( "#log" ).prepend( $.trim( message ) + "," );
-}
+TestHelpers.menu = {
+	log: function( message, clear ) {
+		if ( clear ) {
+			$( "#log" ).empty();
+		}
+		if ( message === undefined ) {
+			message = $( "#log" ).data( "lastItem" );
+		}
+		$( "#log" ).prepend( $.trim( message ) + "," );
+	},
 
-function menu_click( menu, item ) {
-	$( "#log" ).data( "lastItem", item );
-	menu.children( ":eq(" + item + ")" ).find( "a:first" ).trigger( "click" );
-}
\ No newline at end of file
+	click: function( menu, item ) {
+		$( "#log" ).data( "lastItem", item );
+		menu.children( ":eq(" + item + ")" ).find( "a:first" ).trigger( "click" );
+	}
+};
\ No newline at end of file
-- 
cgit v1.2.3


From 33e93ef7f0aff6b6117177638a94e24e02dbc1be Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 12:53:06 -0400
Subject: Tabs tests: Don't pollute the global namespace with helpers.

---
 grunt.js                             |  2 -
 tests/unit/tabs/tabs.html            | 57 +----------------------
 tests/unit/tabs/tabs_core.js         |  4 +-
 tests/unit/tabs/tabs_deprecated.html | 57 +----------------------
 tests/unit/tabs/tabs_deprecated.js   | 90 ++++++++++++++++++------------------
 tests/unit/tabs/tabs_events.js       | 48 ++++++++++---------
 tests/unit/tabs/tabs_methods.js      | 87 +++++++++++++++++-----------------
 tests/unit/tabs/tabs_options.js      | 71 ++++++++++++++--------------
 tests/unit/tabs/tabs_test_helpers.js | 61 ++++++++++++++++++++++++
 9 files changed, 219 insertions(+), 258 deletions(-)
 create mode 100644 tests/unit/tabs/tabs_test_helpers.js

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 33ae33829..e0a085a38 100644
--- a/grunt.js
+++ b/grunt.js
@@ -388,8 +388,6 @@ grunt.initConfig({
 					start: true,
 					strictEqual: true,
 					stop: true,
-					tabs_state: true,
-					tabs_disabled: true,
 					test: true,
 					TestHelpers: true,
 					widthAfter: true
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index fc494e013..7f60ad277 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -25,68 +25,13 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="tabs_test_helpers.js"></script>
 	<script src="tabs_defaults.js"></script>
 	<script src="tabs_core.js"></script>
 	<script src="tabs_events.js"></script>
 	<script src="tabs_methods.js"></script>
 	<script src="tabs_options.js"></script>
 
-	<script>
-	function tabs_state( tabs ) {
-		var expected = $.makeArray( arguments ).slice( 1 );
-		var actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
-			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();
-		deepEqual( 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();
-		deepEqual( tabs.tabs( "option", "disabled" ), state );
-		deepEqual( actual, expected );
-	}
-	</script>
 	<script src="../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js
index 21250fb33..b9bd81987 100644
--- a/tests/unit/tabs/tabs_core.js
+++ b/tests/unit/tabs/tabs_core.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var state = TestHelpers.tabs.state;
+
 module( "tabs: core" );
 
 test( "markup structure", function() {
@@ -89,7 +91,7 @@ test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", funct
 	});
 
 	equal( element.find( ".ui-tabs-nav a" ).attr( "aria-controls" ), "tab", "aria-contorls attribute is correct" );
-	tabs_state( element, 1 );
+	state( element, 1 );
 });
 
 }( jQuery ) );
diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index 410aebc40..c22ec3369 100644
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -23,6 +23,7 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="tabs_test_helpers.js"></script>
 	<script src="tabs_defaults_deprecated.js"></script>
 	<script src="tabs_core.js"></script>
 	<script src="tabs_events.js"></script>
@@ -30,62 +31,6 @@
 	<script src="tabs_options.js"></script>
 	<script src="tabs_deprecated.js"></script>
 
-	<script>
-	function tabs_state( tabs ) {
-		var expected = $.makeArray( arguments ).slice( 1 );
-		var actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
-			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();
-		deepEqual( 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();
-		deepEqual( tabs.tabs( "option", "disabled" ), state );
-		deepEqual( actual, expected );
-	}
-	</script>
 	<script src="../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index c8f0e2881..8386a13ac 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var state = TestHelpers.tabs.state;
+
 module( "tabs (deprecated): core" );
 
 test( "panel ids", function() {
@@ -48,17 +50,17 @@ asyncTest( "cache", function() {
 		cache: true
 	});
 	element.one( "tabsshow", function( event, ui ) {
-		tabs_state( element, 0, 0, 1, 0, 0 );
+		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 );
+			state( element, 1, 0, 0, 0, 0 );
 
 			element.one( "tabsshow", function( event, ui ) {
-				tabs_state( element, 0, 0, 1, 0, 0 );
+				state( element, 0, 0, 1, 0, 0 );
 			});
 			element.one( "tabsload", function( event, ui ) {
 				ok( false, "should be cached" );
@@ -68,7 +70,7 @@ asyncTest( "cache", function() {
 		}, 1 );
 	});
 	element.tabs( "option", "active", 2 );
-	tabs_state( element, 0, 0, 1, 0, 0 );
+	state( element, 0, 0, 1, 0, 0 );
 });
 
 test( "idPrefix", function() {
@@ -171,50 +173,50 @@ test( "selected", function() {
 
 	var element = $( "#tabs1" ).tabs();
 	equal( element.tabs( "option", "selected" ), 0, "should be 0 by default" );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.tabs( "destroy" );
 
 	location.hash = "#fragment-3";
 	element = $( "#tabs1" ).tabs();
 	equal( element.tabs( "option", "selected" ), 2, "should be 2 based on URL" );
-	tabs_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.tabs( "destroy" );
 
 	el = $('#tabs1').tabs({
 		selected: -1,
 		collapsible: true
 	});
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 	equal( element.find( ".ui-tabs-nav .ui-state-active" ).size(), 0, "no tabs selected" );
 	strictEqual( element.tabs( "option", "selected" ), -1 );
 
 	element.tabs( "option", "collapsible", false );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	equal( element.tabs( "option", "selected" ), 0 );
 	element.tabs( "destroy" );
 
 	element.tabs({
 		selected: -1
 	});
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	strictEqual( element.tabs( "option", "selected" ), 0 );
 	element.tabs( "destroy" );
 
 	element.tabs({ selected: 2 });
 	equal( element.tabs( "option", "selected" ), 2 );
-	tabs_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 
 	element.tabs( "option", "selected", 0 );
 	equal( element.tabs( "option", "selected" ), 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.find( ".ui-tabs-nav a" ).eq( 1 ).click();
 	equal( element.tabs( "option", "selected" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.tabs( "option", "selected", 10 );
 	equal( element.tabs( "option", "selected" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	location.hash = "#";
 });
@@ -237,7 +239,7 @@ asyncTest( "load", function() {
 		strictEqual( ui.tab, tab[ 0 ], "tab" );
 		strictEqual( ui.panel, panel[ 0 ], "panel" );
 		equal( $( ui.panel ).find( "p" ).length, 1, "panel html" );
-		tabs_state( element, 0, 0, 1, 0, 0 );
+		state( element, 0, 0, 1, 0, 0 );
 		tabsload1();
 	});
 	element.tabs({ active: 2 });
@@ -253,7 +255,7 @@ asyncTest( "load", function() {
 			strictEqual( ui.tab, tab[ 0 ], "tab" );
 			strictEqual( ui.panel, panel[ 0 ], "panel" );
 			equal( $( ui.panel ).find( "p" ).length, 1, "panel html" );
-			tabs_state( element, 0, 0, 0, 1, 0 );
+			state( element, 0, 0, 0, 1, 0 );
 			tabsload2();
 		});
 		element.tabs( "option", "active", 3 );
@@ -270,7 +272,7 @@ asyncTest( "load", function() {
 			strictEqual( ui.tab, tab[ 0 ], "tab" );
 			strictEqual( ui.panel, panel[ 0 ], "panel" );
 			equal( $( ui.panel ).find( "p" ).length, 1, "panel html" );
-			tabs_state( element, 0, 0, 0, 0, 1 );
+			state( element, 0, 0, 0, 0, 1 );
 			start();
 		});
 		element.find( ".ui-tabs-nav a" ).eq( 4 ).click();
@@ -325,10 +327,10 @@ test( "show", function() {
 		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 );
+		state( element, 1, 0, 0 );
 	});
 	element.tabs( "option", "active", 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	// switching tabs
 	element.one( "tabsshow", function( event, ui ) {
@@ -336,17 +338,17 @@ test( "show", function() {
 		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 );
+		state( element, 0, 1, 0 );
 	});
 	tabs.eq( 1 ).click();
-	tabs_state( element, 0, 1, 0 );
+	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 );
+	state( element, 0, 0, 0 );
 });
 
 test( "select", function() {
@@ -365,10 +367,10 @@ test( "select", function() {
 		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 );
+		state( element, 0, 0, 0 );
 	});
 	element.tabs( "option", "active", 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	// switching tabs
 	element.one( "tabsselect", function( event, ui ) {
@@ -376,17 +378,17 @@ test( "select", function() {
 		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 );
+		state( element, 1, 0, 0 );
 	});
 	tabs.eq( 1 ).click();
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	// collapsing
 	element.one( "tabsselect", function( event, ui ) {
 		ok( false, "collapsing" );
 	});
 	element.tabs( "option", "active", false );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 module( "tabs (deprecated): methods" );
@@ -396,7 +398,7 @@ test( "add", function() {
 
 	var tab, anchor,
 		element = $( "#tabs1" ).tabs();
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	// add without index
 	element.one( "tabsadd", function( event, ui ) {
@@ -405,7 +407,7 @@ test( "add", function() {
 		equal( ui.panel.id, "new", "ui.panel" );
 	});
 	element.tabs( "add", "#new", "New" );
-	tabs_state( element, 1, 0, 0, 0 );
+	state( element, 1, 0, 0, 0 );
 	tab = element.find( ".ui-tabs-nav li" ).last();
 	anchor = tab.find( "a" );
 	equal( tab.text(), "New", "label" );
@@ -415,7 +417,7 @@ test( "add", function() {
 	anchor.simulate( "mouseover" );
 	ok( tab.hasClass( "ui-state-hover" ), "hovered" );
 	anchor.simulate( "click" );
-	tabs_state( element, 0, 0, 0, 1 );
+	state( element, 0, 0, 0, 1 );
 
 	// add remote tab with index
 	element.one( "tabsadd", function( event, ui ) {
@@ -424,7 +426,7 @@ test( "add", function() {
 		equal( ui.panel.id, $( ui.tab ).attr( "aria-controls" ), "ui.panel" );
 	});
 	element.tabs( "add", "data/test.html", "New Remote", 1 );
-	tabs_state( element, 0, 0, 0, 0, 1 );
+	state( element, 0, 0, 0, 0, 1 );
 	tab = element.find( ".ui-tabs-nav li" ).eq( 1 );
 	anchor = tab.find( "a" );
 	equal( tab.text(), "New Remote", "label" );
@@ -434,7 +436,7 @@ test( "add", function() {
 	anchor.simulate( "mouseover" );
 	ok( tab.hasClass( "ui-state-hover" ), "hovered" );
 	anchor.simulate( "click" );
-	tabs_state( element, 0, 1, 0, 0, 0 );
+	state( element, 0, 1, 0, 0, 0 );
 
 	// add to empty tab set
 	element = $( "<div><ul></ul></div>" ).tabs();
@@ -445,7 +447,7 @@ test( "add", function() {
 		equal( ui.panel.id, "first", "ui.panel" );
 	});
 	element.tabs( "add", "#first", "First" );
-	tabs_state( element, 1 );
+	state( element, 1 );
 	equal( element.tabs( "option", "active" ), 0, "active: 0 after add" );
 });
 
@@ -462,7 +464,7 @@ test( "remove", function() {
 	expect( 17 );
 
 	var element = $( "#tabs1" ).tabs({ active: 1 });
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.one( "tabsremove", function( event, ui ) {
 		equal( ui.index, -1, "ui.index" );
@@ -470,7 +472,7 @@ test( "remove", function() {
 		equal( ui.panel.id, "fragment-2", "ui.panel" );
 	});
 	element.tabs( "remove", 1 );
-	tabs_state( element, 0, 1 );
+	state( element, 0, 1 );
 	equal( element.tabs( "option", "active" ), 1 );
 	equal( element.find( ".ui-tabs-nav li a[href$='fragment-2']" ).length, 0,
 		"remove correct list item" );
@@ -482,7 +484,7 @@ test( "remove", function() {
 		equal( ui.panel.id, "fragment-3", "ui.panel" );
 	});
 	element.tabs( "remove", 1 );
-	tabs_state( element, 1 );
+	state( element, 1 );
 	equal( element.tabs( "option", "active"), 0 );
 
 	element.one( "tabsremove", function( event, ui ) {
@@ -498,43 +500,43 @@ test( "select", function() {
 	expect( 23 );
 
 	var element = $( "#tabs1" ).tabs();
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.tabs( "select", 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 	equal( element.tabs( "option", "active" ), 1, "active" );
 	equal( element.tabs( "option", "selected" ), 1, "selected" );
 	element.tabs( "destroy" );
 
 	element.tabs({ collapsible: true });
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.tabs( "select", 0 );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 	equal( element.tabs( "option", "active" ), false, "active" );
 	equal( element.tabs( "option", "selected" ), -1, "selected" );
 	element.tabs( "destroy" );
 
 	element.tabs({ collapsible: true });
 	element.tabs( "select", -1 );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 	equal( element.tabs( "option", "active" ), false, "active" );
 	equal( element.tabs( "option", "selected" ), -1, "selected" );
 	element.tabs( "destroy" );
 
 	element.tabs();
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	equal( element.tabs( "option", "active" ), 0, "active" );
 	equal( element.tabs( "option", "selected" ), 0, "selected" );
 	element.tabs( "select", 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	equal( element.tabs( "option", "active" ), 0, "active" );
 	equal( element.tabs( "option", "selected" ), 0, "selected" );
 	element.tabs( "select", -1 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	equal( element.tabs( "option", "active" ), 0, "active" );
 	equal( element.tabs( "option", "selected" ), 0, "selected" );
 
 	element.tabs( "select", "#fragment-2" );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 	equal( element.tabs( "option", "active" ), 1, "active" );
 	equal( element.tabs( "option", "selected" ), 1, "selected" );
 });
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index 4f9269b62..3f6ec14d0 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var state = TestHelpers.tabs.state;
+
 module( "tabs: events" );
 
 test( "create", function() {
@@ -60,10 +62,10 @@ test( "beforeActivate", function() {
 		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
 		equal( ui.newPanel.size(), 1, "newPanel size" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
-		tabs_state( element, 0, 0, 0 );
+		state( element, 0, 0, 0 );
 	});
 	element.tabs( "option", "active", 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	// switching tabs
 	element.one( "tabsbeforeactivate", function( event, ui ) {
@@ -76,10 +78,10 @@ test( "beforeActivate", function() {
 		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
 		equal( ui.newPanel.size(), 1, "newPanel size" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
-		tabs_state( element, 1, 0, 0 );
+		state( element, 1, 0, 0 );
 	});
 	tabs.eq( 1 ).click();
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	// collapsing
 	element.one( "tabsbeforeactivate", function( event, ui ) {
@@ -90,10 +92,10 @@ test( "beforeActivate", function() {
 		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
 		equal( ui.newTab.size(), 0, "newTab size" );
 		equal( ui.newPanel.size(), 0, "newPanel size" );
-		tabs_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 	});
 	element.tabs( "option", "active", false );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 
 	// prevent activation
 	element.one( "tabsbeforeactivate", function( event, ui ) {
@@ -105,10 +107,10 @@ test( "beforeActivate", function() {
 		equal( ui.newPanel.size(), 1, "newPanel size" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		event.preventDefault();
-		tabs_state( element, 0, 0, 0 );
+		state( element, 0, 0, 0 );
 	});
 	element.tabs( "option", "active", 1 );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "activate", function() {
@@ -130,10 +132,10 @@ test( "activate", function() {
 		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
 		equal( ui.newPanel.size(), 1, "newPanel size" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
-		tabs_state( element, 1, 0, 0 );
+		state( element, 1, 0, 0 );
 	});
 	element.tabs( "option", "active", 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	// switching tabs
 	element.one( "tabsactivate", function( event, ui ) {
@@ -146,10 +148,10 @@ test( "activate", function() {
 		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
 		equal( ui.newPanel.size(), 1, "newPanel size" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
-		tabs_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 	});
 	tabs.eq( 1 ).click();
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	// collapsing
 	element.one( "tabsactivate", function( event, ui ) {
@@ -160,10 +162,10 @@ test( "activate", function() {
 		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
 		equal( ui.newTab.size(), 0, "newTab size" );
 		equal( ui.newPanel.size(), 0, "newPanel size" );
-		tabs_state( element, 0, 0, 0 );
+		state( element, 0, 0, 0 );
 	});
 	element.tabs( "option", "active", false );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 
 	// prevent activation
 	element.one( "tabsbeforeactivate", function( event ) {
@@ -197,10 +199,10 @@ test( "beforeLoad", function() {
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		equal( ui.panel.html(), "", "panel html" );
 		event.preventDefault();
-		tabs_state( element, 0, 0, 1, 0, 0 );
+		state( element, 0, 0, 1, 0, 0 );
 	});
 	element.tabs({ active: 2 });
-	tabs_state( element, 0, 0, 1, 0, 0 );
+	state( element, 0, 0, 1, 0, 0 );
 	equal( panel.html(), "", "panel html after" );
 	element.tabs( "destroy" );
 
@@ -219,11 +221,11 @@ test( "beforeLoad", function() {
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		equal( ui.panel.html(), "", "panel html" );
 		event.preventDefault();
-		tabs_state( element, 1, 0, 0, 0, 0 );
+		state( element, 1, 0, 0, 0, 0 );
 	});
 	element.tabs();
 	element.tabs( "option", "active", 2 );
-	tabs_state( element, 0, 0, 1, 0, 0 );
+	state( element, 0, 0, 1, 0, 0 );
 	equal( panel.html(), "", "panel html after" );
 
 	// click, change panel content
@@ -241,10 +243,10 @@ test( "beforeLoad", function() {
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		ui.panel.html( "<p>testing</p>" );
 		event.preventDefault();
-		tabs_state( element, 0, 0, 1, 0, 0 );
+		state( element, 0, 0, 1, 0, 0 );
 	});
 	element.find( ".ui-tabs-nav a" ).eq( 3 ).click();
-	tabs_state( element, 0, 0, 0, 1, 0 );
+	state( element, 0, 0, 0, 1, 0 );
 	// .toLowerCase() is needed to convert <P> to <p> in old IEs
 	equal( panel.html().toLowerCase(), "<p>testing</p>", "panel html after" );
 });
@@ -268,7 +270,7 @@ if ( $.uiBackCompat === false ) {
 			equal( ui.panel.size(), 1, "panel size" );
 			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 			equal( ui.panel.find( "p" ).length, 1, "panel html" );
-			tabs_state( element, 0, 0, 1, 0, 0 );
+			state( element, 0, 0, 1, 0, 0 );
 			tabsload1();
 		});
 		element.tabs({ active: 2 });
@@ -286,7 +288,7 @@ if ( $.uiBackCompat === false ) {
 				equal( ui.panel.size(), 1, "panel size" );
 				strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 				equal( ui.panel.find( "p" ).length, 1, "panel html" );
-				tabs_state( element, 0, 0, 0, 1, 0 );
+				state( element, 0, 0, 0, 1, 0 );
 				tabsload2();
 			});
 			element.tabs( "option", "active", 3 );
@@ -305,7 +307,7 @@ if ( $.uiBackCompat === false ) {
 				equal( ui.panel.size(), 1, "panel size" );
 				strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 				equal( ui.panel.find( "p" ).length, 1, "panel html" );
-				tabs_state( element, 0, 0, 0, 0, 1 );
+				state( element, 0, 0, 0, 0, 1 );
 				start();
 			});
 			element.find( ".ui-tabs-nav a" ).eq( 4 ).click();
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 );
 	}
 });
 
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index e1ebf5efa..40d4ceaa7 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -1,5 +1,8 @@
 (function( $ ) {
 
+var disabled = TestHelpers.tabs.disabled,
+	state = TestHelpers.tabs.state;
+
 module( "tabs: options" );
 
 test( "{ active: default }", function() {
@@ -7,13 +10,13 @@ test( "{ active: default }", function() {
 
 	var element = $( "#tabs1" ).tabs();
 	equal( element.tabs( "option", "active" ), 0, "should be 0 by default" );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	element.tabs( "destroy" );
 
 	location.hash = "#fragment-3";
 	element = $( "#tabs1" ).tabs();
 	equal( element.tabs( "option", "active" ), 2, "should be 2 based on URL" );
-	tabs_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 	element.tabs( "destroy" );
 	location.hash = "#";
 });
@@ -25,19 +28,19 @@ test( "{ active: false }", function() {
 		active: false,
 		collapsible: true
 	});
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 	equal( element.find( ".ui-tabs-nav .ui-state-active" ).size(), 0, "no tabs selected" );
 	strictEqual( element.tabs( "option", "active" ), false );
 
 	element.tabs( "option", "collapsible", false );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	equal( element.tabs( "option", "active" ), 0 );
 
 	element.tabs( "destroy" );
 	element.tabs({
 		active: false
 	});
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 	strictEqual( element.tabs( "option", "active" ), 0 );
 });
 
@@ -48,19 +51,19 @@ test( "{ active: Number }", function() {
 		active: 2
 	});
 	equal( element.tabs( "option", "active" ), 2 );
-	tabs_state( element, 0, 0, 1 );
+	state( element, 0, 0, 1 );
 
 	element.tabs( "option", "active", 0 );
 	equal( element.tabs( "option", "active" ), 0 );
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.find( ".ui-tabs-nav a" ).eq( 1 ).click();
 	equal( element.tabs( "option", "active" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.tabs( "option", "active", 10 );
 	equal( element.tabs( "option", "active" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 if ( $.uiBackCompat === false ) {
@@ -69,19 +72,19 @@ if ( $.uiBackCompat === false ) {
 			active: -1
 		});
 		equal( element.tabs( "option", "active" ), 2 );
-		tabs_state( element, 0, 0, 1 );
+		state( element, 0, 0, 1 );
 
 		element.tabs( "option", "active", -2 );
 		equal( element.tabs( "option", "active" ), 1 );
-		tabs_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 
 		element.tabs( "option", "active", -10 );
 		equal( element.tabs( "option", "active" ), 1 );
-		tabs_state( element, 0, 1, 0 );
+		state( element, 0, 1, 0 );
 
 		element.tabs( "option", "active", -3 );
 		equal( element.tabs( "option", "active" ), 0 );
-		tabs_state( element, 1, 0, 0 );
+		state( element, 1, 0, 0 );
 	});
 }
 
@@ -91,9 +94,9 @@ test( "active - mismatched tab/panel order", function() {
 	location.hash = "#tabs7-2";
 	var element = $( "#tabs7" ).tabs();
 	equal( element.tabs( "option", "active" ), 1, "should be 1 based on URL" );
-	tabs_state( element, 0, 1 );
+	state( element, 0, 1 );
 	element.tabs( "option", "active", 0 );
-	tabs_state( element, 1, 0 );
+	state( element, 1, 0 );
 	location.hash = "#";
 });
 
@@ -105,11 +108,11 @@ test( "{ collapsible: false }", function() {
 	});
 	element.tabs( "option", "active", false );
 	equal( element.tabs( "option", "active" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.find( ".ui-state-active a" ).eq( 1 ).click();
 	equal( element.tabs( "option", "active" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ collapsible: true }", function() {
@@ -122,15 +125,15 @@ test( "{ collapsible: true }", function() {
 
 	element.tabs( "option", "active", false );
 	equal( element.tabs( "option", "active" ), false );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 
 	element.tabs( "option", "active", 1 );
 	equal( element.tabs( "option", "active" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	state( element, 0, 1, 0 );
 
 	element.find( ".ui-state-active a" ).click();
 	equal( element.tabs( "option", "active" ), false );
-	tabs_state( element, 0, 0, 0 );
+	state( element, 0, 0, 0 );
 });
 
 test( "disabled", function() {
@@ -138,23 +141,23 @@ test( "disabled", function() {
 
 	// fully enabled by default
 	var element = $( "#tabs1" ).tabs();
-	tabs_disabled( element, false );
+	disabled( element, false );
 
 	// disable single tab
 	element.tabs( "option", "disabled", [ 1 ] );
-	tabs_disabled( element, [ 1 ] );
+	disabled( element, [ 1 ] );
 
 	// disabled active tab
 	element.tabs( "option", "disabled", [ 0, 1 ] );
-	tabs_disabled( element, [ 0, 1 ] );
+	disabled( element, [ 0, 1 ] );
 
 	// disable all tabs
 	element.tabs( "option", "disabled", [ 0, 1, 2 ] );
-	tabs_disabled( element, true );
+	disabled( element, true );
 
 	// enable all tabs
 	element.tabs( "option", "disabled", [] );
-	tabs_disabled( element, false );
+	disabled( element, false );
 });
 
 test( "{ event: null }", function() {
@@ -163,16 +166,16 @@ test( "{ event: null }", function() {
 	var element = $( "#tabs1" ).tabs({
 		event: null
 	});
-	tabs_state( element, 1, 0, 0 );
+	state( element, 1, 0, 0 );
 
 	element.tabs( "option", "active", 1 );
 	equal( element.tabs( "option", "active" ), 1 );
-	tabs_state( element, 0, 1, 0 );
+	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 );
+	state( element, 0, 1, 0 );
 });
 
 test( "{ event: custom }", function() {
@@ -181,31 +184,31 @@ test( "{ event: custom }", function() {
 	var element = $( "#tabs1" ).tabs({
 		event: "custom1 custom2"
 	});
-	tabs_state( element, 1, 0, 0 );
+	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 );
+	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 );
+	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 );
+	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 );
+	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 );
+	state( element, 0, 1, 0 );
 });
 
 // TODO: add animation tests
diff --git a/tests/unit/tabs/tabs_test_helpers.js b/tests/unit/tabs/tabs_test_helpers.js
new file mode 100644
index 000000000..9f592c074
--- /dev/null
+++ b/tests/unit/tabs/tabs_test_helpers.js
@@ -0,0 +1,61 @@
+TestHelpers.tabs = {
+	disabled: function( tabs, state ) {
+		var expected, actual,
+			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;
+			});
+		}
+
+		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;
+			}
+		});
+
+		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;
+			}
+			// mixed state - invalid
+			return -1;
+		}).get();
+
+		deepEqual( tabs.tabs( "option", "disabled" ), state );
+		deepEqual( actual, expected );
+	},
+
+	state: function( tabs ) {
+		var expected = $.makeArray( arguments ).slice( 1 ),
+			actual = tabs.find( ".ui-tabs-nav li" ).map(function() {
+				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();
+		deepEqual( actual, expected );
+	}
+};
+
-- 
cgit v1.2.3


From e9d5079b04bfc6bf4103630e936be3022d83353c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 13:03:21 -0400
Subject: Tests: Move commonWidgetTests() to TestHelpers.

---
 grunt.js                                           |  1 -
 tests/unit/accordion/accordion_defaults.js         |  2 +-
 .../accordion/accordion_defaults_deprecated.js     |  2 +-
 tests/unit/autocomplete/autocomplete_defaults.js   |  2 +-
 tests/unit/button/button_defaults.js               |  2 +-
 tests/unit/datepicker/datepicker_defaults.js       |  2 +-
 tests/unit/dialog/dialog_defaults.js               |  2 +-
 tests/unit/draggable/draggable_defaults.js         | 68 ++++++++++------------
 tests/unit/droppable/droppable_defaults.js         |  2 +-
 tests/unit/menu/menu_defaults.js                   |  2 +-
 tests/unit/progressbar/progressbar_defaults.js     |  2 +-
 tests/unit/resizable/resizable_defaults.js         | 52 ++++++++---------
 tests/unit/selectable/selectable_defaults.js       | 28 ++++-----
 tests/unit/slider/slider_defaults.js               |  2 +-
 tests/unit/sortable/sortable_defaults.js           | 64 ++++++++++----------
 tests/unit/spinner/spinner_defaults.js             |  2 +-
 tests/unit/tabs/tabs_defaults.js                   |  2 +-
 tests/unit/tabs/tabs_defaults_deprecated.js        |  2 +-
 tests/unit/testsuite.js                            |  2 +-
 tests/unit/tooltip/tooltip_defaults.js             |  2 +-
 20 files changed, 113 insertions(+), 130 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index e0a085a38..82e7fe1e8 100644
--- a/grunt.js
+++ b/grunt.js
@@ -350,7 +350,6 @@ grunt.initConfig({
 				globals: {
 					addMonths: true,
 					asyncTest: true,
-					commonWidgetTests: true,
 					container: true,
 					deepEqual: true,
 					d1: true,
diff --git a/tests/unit/accordion/accordion_defaults.js b/tests/unit/accordion/accordion_defaults.js
index 9ad85bbce..ef24cf25e 100644
--- a/tests/unit/accordion/accordion_defaults.js
+++ b/tests/unit/accordion/accordion_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "accordion", {
+TestHelpers.commonWidgetTests( "accordion", {
 	defaults: {
 		active: 0,
 		animate: {},
diff --git a/tests/unit/accordion/accordion_defaults_deprecated.js b/tests/unit/accordion/accordion_defaults_deprecated.js
index 99f5ac827..22d5e1289 100644
--- a/tests/unit/accordion/accordion_defaults_deprecated.js
+++ b/tests/unit/accordion/accordion_defaults_deprecated.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "accordion", {
+TestHelpers.commonWidgetTests( "accordion", {
 	defaults: {
 		active: 0,
 		animate: null,
diff --git a/tests/unit/autocomplete/autocomplete_defaults.js b/tests/unit/autocomplete/autocomplete_defaults.js
index ac83eaea4..c090ce4df 100644
--- a/tests/unit/autocomplete/autocomplete_defaults.js
+++ b/tests/unit/autocomplete/autocomplete_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "autocomplete", {
+TestHelpers.commonWidgetTests( "autocomplete", {
 	defaults: {
 		appendTo: "body",
 		autoFocus: false,
diff --git a/tests/unit/button/button_defaults.js b/tests/unit/button/button_defaults.js
index 96c7e5bfa..ef22d3011 100644
--- a/tests/unit/button/button_defaults.js
+++ b/tests/unit/button/button_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "button", {
+TestHelpers.commonWidgetTests( "button", {
 	defaults: {
 		disabled: null,
 		icons: {
diff --git a/tests/unit/datepicker/datepicker_defaults.js b/tests/unit/datepicker/datepicker_defaults.js
index 4243cf187..28e150791 100644
--- a/tests/unit/datepicker/datepicker_defaults.js
+++ b/tests/unit/datepicker/datepicker_defaults.js
@@ -6,4 +6,4 @@ var datepicker_defaults = {
 	disabled: false
 };
 
-//commonWidgetTests('datepicker', { defaults: datepicker_defaults });
+//TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults });
diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js
index 9f2e4c6a8..623908da7 100644
--- a/tests/unit/dialog/dialog_defaults.js
+++ b/tests/unit/dialog/dialog_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "dialog", {
+TestHelpers.commonWidgetTests( "dialog", {
 	defaults: {
 		autoOpen: true,
 		buttons: {},
diff --git a/tests/unit/draggable/draggable_defaults.js b/tests/unit/draggable/draggable_defaults.js
index 4b0aaca19..b47b139cd 100644
--- a/tests/unit/draggable/draggable_defaults.js
+++ b/tests/unit/draggable/draggable_defaults.js
@@ -1,36 +1,32 @@
-/*
- * draggable_defaults.js
- */
-
-var draggable_defaults = {
-	addClasses: true,
-	appendTo: "parent",
-	axis: false,
-	cancel: ":input,option",
-	connectToSortable: false,
-	containment: false,
-	cursor: "auto",
-	cursorAt: false,
-	delay: 0,
-	disabled: false,
-	distance: 1,
-	grid: false,
-	handle: false,
-	helper: "original",
-	iframeFix: false,
-	opacity: false,
-	refreshPositions: false,
-	revert: false,
-	revertDuration: 500,
-	scroll: true,
-	scrollSensitivity: 20,
-	scrollSpeed: 20,
-	scope: "default",
-	snap: false,
-	snapMode: "both",
-	snapTolerance: 20,
-	stack: false,
-	zIndex: false
-};
-
-commonWidgetTests('draggable', { defaults: draggable_defaults });
+TestHelpers.commonWidgetTests( "draggable", {
+	defaults: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		cancel: ":input,option",
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false
+	}
+});
diff --git a/tests/unit/droppable/droppable_defaults.js b/tests/unit/droppable/droppable_defaults.js
index 5a1a4198c..985dba06d 100644
--- a/tests/unit/droppable/droppable_defaults.js
+++ b/tests/unit/droppable/droppable_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "droppable", {
+TestHelpers.commonWidgetTests( "droppable", {
 	defaults: {
 		accept: "*",
 		activeClass: false,
diff --git a/tests/unit/menu/menu_defaults.js b/tests/unit/menu/menu_defaults.js
index 018ac8ccf..ddcdbebf2 100644
--- a/tests/unit/menu/menu_defaults.js
+++ b/tests/unit/menu/menu_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "menu", {
+TestHelpers.commonWidgetTests( "menu", {
 	defaults: {
 		disabled: false,
 		menus: "ul",
diff --git a/tests/unit/progressbar/progressbar_defaults.js b/tests/unit/progressbar/progressbar_defaults.js
index 3856e31a0..2f97a78bb 100644
--- a/tests/unit/progressbar/progressbar_defaults.js
+++ b/tests/unit/progressbar/progressbar_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "progressbar", {
+TestHelpers.commonWidgetTests( "progressbar", {
 	defaults: {
 		disabled: false,
 		value: 0,
diff --git a/tests/unit/resizable/resizable_defaults.js b/tests/unit/resizable/resizable_defaults.js
index f69e5217c..c46e10781 100644
--- a/tests/unit/resizable/resizable_defaults.js
+++ b/tests/unit/resizable/resizable_defaults.js
@@ -1,28 +1,24 @@
-/*
- * resizable_defaults.js
- */
-
-var resizable_defaults = {
-	alsoResize: false,
-	animate: false,
-	animateDuration: 'slow',
-	animateEasing: 'swing',
-	aspectRatio: false,
-	autoHide: false,
-	cancel: ':input,option',
-	containment: false,
-	delay: 0,
-	disabled: false,
-	distance: 1,
-	ghost: false,
-	grid: false,
-	handles: 'e,s,se',
-	helper: false,
-	maxHeight: null,
-	maxWidth: null,
-	minHeight: 10,
-	minWidth: 10,
-	zIndex: 1000
-};
-
-commonWidgetTests('resizable', { defaults: resizable_defaults });
+TestHelpers.commonWidgetTests('resizable', {
+	defaults: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: 'slow',
+		animateEasing: 'swing',
+		aspectRatio: false,
+		autoHide: false,
+		cancel: ':input,option',
+		containment: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		ghost: false,
+		grid: false,
+		handles: 'e,s,se',
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 1000
+	}
+});
diff --git a/tests/unit/selectable/selectable_defaults.js b/tests/unit/selectable/selectable_defaults.js
index dbf799a43..27714d0ae 100644
--- a/tests/unit/selectable/selectable_defaults.js
+++ b/tests/unit/selectable/selectable_defaults.js
@@ -1,16 +1,12 @@
-/*
- * selectable_defaults.js
- */
-
-var selectable_defaults = {
-	appendTo: 'body',
-	autoRefresh: true,
-	cancel: ':input,option',
-	delay: 0,
-	disabled: false,
-	distance: 0,
-	filter: '*',
-	tolerance: 'touch'
-};
-
-commonWidgetTests('selectable', { defaults: selectable_defaults });
+TestHelpers.commonWidgetTests('selectable', {
+	defaults: {
+		appendTo: 'body',
+		autoRefresh: true,
+		cancel: ':input,option',
+		delay: 0,
+		disabled: false,
+		distance: 0,
+		filter: '*',
+		tolerance: 'touch'
+	}
+});
diff --git a/tests/unit/slider/slider_defaults.js b/tests/unit/slider/slider_defaults.js
index 8049fe969..8a0b347f3 100644
--- a/tests/unit/slider/slider_defaults.js
+++ b/tests/unit/slider/slider_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "slider", {
+TestHelpers.commonWidgetTests( "slider", {
 	defaults: {
 		animate: false,
 		cancel: ':input,option',
diff --git a/tests/unit/sortable/sortable_defaults.js b/tests/unit/sortable/sortable_defaults.js
index 7681addad..b5fc05a5d 100644
--- a/tests/unit/sortable/sortable_defaults.js
+++ b/tests/unit/sortable/sortable_defaults.js
@@ -1,34 +1,30 @@
-/*
- * sortable_defaults.js
- */
-
-var sortable_defaults = {
-	appendTo: "parent",
-	axis: false,
-	cancel: ":input,option",
-	connectWith: false,
-	containment: false,
-	cursor: 'auto',
-	cursorAt: false,
-	delay: 0,
-	disabled: false,
-	distance: 1,
-	dropOnEmpty: true,
-	forcePlaceholderSize: false,
-	forceHelperSize: false,
-	grid: false,
-	handle: false,
-	helper: "original",
-	items: "> *",
-	opacity: false,
-	placeholder: false,
-	revert: false,
-	scroll: true,
-	scrollSensitivity: 20,
-	scrollSpeed: 20,
-	scope: "default",
-	tolerance: "intersect",
-	zIndex: 1000
-};
-
-commonWidgetTests('sortable', { defaults: sortable_defaults });
+TestHelpers.commonWidgetTests( "sortable", {
+	defaults: {
+		appendTo: "parent",
+		axis: false,
+		cancel: ":input,option",
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000
+	}
+});
diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js
index 0a4e7c236..4f05b1e63 100644
--- a/tests/unit/spinner/spinner_defaults.js
+++ b/tests/unit/spinner/spinner_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "spinner", {
+TestHelpers.commonWidgetTests( "spinner", {
 	defaults: {
 		culture: null,
 		disabled: false,
diff --git a/tests/unit/tabs/tabs_defaults.js b/tests/unit/tabs/tabs_defaults.js
index 52b6f8a71..7ffb05da4 100644
--- a/tests/unit/tabs/tabs_defaults.js
+++ b/tests/unit/tabs/tabs_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "tabs", {
+TestHelpers.commonWidgetTests( "tabs", {
 	defaults: {
 		active: null,
 		collapsible: false,
diff --git a/tests/unit/tabs/tabs_defaults_deprecated.js b/tests/unit/tabs/tabs_defaults_deprecated.js
index 1a56297e9..fdcff21b3 100644
--- a/tests/unit/tabs/tabs_defaults_deprecated.js
+++ b/tests/unit/tabs/tabs_defaults_deprecated.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "tabs", {
+TestHelpers.commonWidgetTests( "tabs", {
 	defaults: {
 		active: null,
 		ajaxOptions: null,
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 648b302ee..a877e38af 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -56,7 +56,7 @@ function testBasicUsage( widget ) {
 	});
 }
 
-window.commonWidgetTests = function( widget, settings ) {
+TestHelpers.commonWidgetTests = function( widget, settings ) {
 	module( widget + ": common widget" );
 
 	testWidgetDefaults( widget, settings.defaults );
diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js
index b8b41bf47..d12ee9519 100644
--- a/tests/unit/tooltip/tooltip_defaults.js
+++ b/tests/unit/tooltip/tooltip_defaults.js
@@ -1,4 +1,4 @@
-commonWidgetTests( "tooltip", {
+TestHelpers.commonWidgetTests( "tooltip", {
 	defaults: {
 		content: function() {},
 		disabled: false,
-- 
cgit v1.2.3


From d62d9d4eff764220be9696acc7ffe8bf0d24c570 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 19 Apr 2012 13:12:23 -0400
Subject: Spinner tests: Don't pollute the global namespace with helpers.

---
 grunt.js                                   |  1 -
 tests/unit/spinner/spinner_core.js         | 42 ++++++++++++------------
 tests/unit/spinner/spinner_events.js       | 52 ++++++++++++++++--------------
 tests/unit/spinner/spinner_methods.js      | 12 ++++---
 tests/unit/spinner/spinner_options.js      |  2 ++
 tests/unit/spinner/spinner_test_helpers.js | 11 ++++---
 6 files changed, 65 insertions(+), 55 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index 82e7fe1e8..d03acdca9 100644
--- a/grunt.js
+++ b/grunt.js
@@ -383,7 +383,6 @@ grunt.initConfig({
 					shouldnotmove: true,
 					shouldnotresize: true,
 					shouldresize: true,
-					spinner_simulateKeyDownUp: true,
 					start: true,
 					strictEqual: true,
 					stop: true,
diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js
index e38b467a3..a1179bb35 100644
--- a/tests/unit/spinner/spinner_core.js
+++ b/tests/unit/spinner/spinner_core.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
+
 module( "spinner: core" );
 
 test( "keydown UP on input, increases value not greater than max", function() {
@@ -9,15 +11,15 @@ test( "keydown UP on input, increases value not greater than max", function() {
 		step: 10
 	});
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 80 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 90 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 100 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 100 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( element.val(), 100 );
 });
 
@@ -28,15 +30,15 @@ test( "keydown DOWN on input, decreases value not less than min", function() {
 		step: 10
 	});
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 40 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 30 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 20 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 20 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( element.val(), 20 );
 });
 
@@ -47,15 +49,15 @@ test( "keydown PAGE_UP on input, increases value not greater than max", function
 		page: 10
 	});
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 80 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 90 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 100 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 100 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( element.val(), 100 );
 });
 
@@ -66,15 +68,15 @@ test( "keydown PAGE_DOWN on input, decreases value not less than min", function(
 		page: 10
 	});
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 40 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 30 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 20 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 20 );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( element.val(), 20 );
 });
 
diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js
index e43ba3365..133a8d5a2 100644
--- a/tests/unit/spinner/spinner_events.js
+++ b/tests/unit/spinner/spinner_events.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
+
 module( "spinner: events" );
 
 test( "start", function() {
@@ -13,14 +15,14 @@ test( "start", function() {
 	}
 
 	shouldStart( true, "key UP" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	shouldStart( true, "key DOWN" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 
 	shouldStart( true, "key PAGE_UP" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	shouldStart( true, "key PAGE_DOWN" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 
 	shouldStart( true, "button up" );
 	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
@@ -52,14 +54,14 @@ test( "spin", function() {
 	}
 
 	shouldSpin( true, "key UP" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	shouldSpin( true, "key DOWN" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 
 	shouldSpin( true, "key PAGE_UP" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	shouldSpin( true, "key PAGE_DOWN" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 
 	shouldSpin( true, "button up" );
 	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
@@ -91,14 +93,14 @@ test( "stop", function() {
 	}
 
 	shouldStop( true, "key UP" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	shouldStop( true, "key DOWN" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 
 	shouldStop( true, "key PAGE_UP" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	shouldStop( true, "key PAGE_DOWN" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 
 	shouldStop( true, "button up" );
 	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
@@ -131,42 +133,42 @@ test( "change", function() {
 
 	element.focus();
 	shouldChange( false, "key UP, before blur" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	shouldChange( true, "blur after key UP" );
 	element.blur();
 
 	element.focus();
 	shouldChange( false, "key DOWN, before blur" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	shouldChange( true, "blur after key DOWN" );
 	element.blur();
 
 	element.focus();
 	shouldChange( false, "key PAGE_UP, before blur" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	shouldChange( true, "blur after key PAGE_UP" );
 	element.blur();
 
 	element.focus();
 	shouldChange( false, "key PAGE_DOWN, before blur" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	shouldChange( true, "blur after key PAGE_DOWN" );
 	element.blur();
 
 	shouldChange( false, "many keys, before blur" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	shouldChange( true, "blur after many keys" );
 	element.blur();
 
 	shouldChange( false, "many keys, same final value, before blur" );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	shouldChange( false, "blur after many keys, same final value" );
 
 	shouldChange( false, "button up, before blur" );
diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/spinner_methods.js
index 2cb3c849f..bafd949a7 100644
--- a/tests/unit/spinner/spinner_methods.js
+++ b/tests/unit/spinner/spinner_methods.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
+
 module( "spinner: methods" );
 
 test( "destroy", function() {
@@ -21,16 +23,16 @@ test( "disable", function() {
 	ok( wrapper.hasClass( "ui-spinner-disabled" ), "after: wrapper has ui-spinner-disabled class" );
 	ok( element.is( ":disabled"), "after: input has disabled attribute" );
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( 2, element.val(), "keyboard - value does not change on key UP" );
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.DOWN );
 	equal( 2, element.val(), "keyboard - value does not change on key DOWN" );
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_UP );
 	equal( 2, element.val(), "keyboard - value does not change on key PGUP" );
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
+	simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
 	equal( 2, element.val(), "keyboard - value does not change on key PGDN" );
 
 	wrapper.find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
@@ -65,7 +67,7 @@ test( "enable", function() {
 	ok( !wrapper.hasClass( ".ui-spinner-disabled" ), "after: wrapper does not have ui-spinner-disabled class" );
 	ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
 
-	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
+	simulateKeyDownUp( element, $.ui.keyCode.UP );
 	equal( 2, element.val(), "keyboard - value changes on key UP" );
 });
 
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index 6f5090d3a..e21852630 100644
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -1,5 +1,7 @@
 (function( $ ) {
 
+var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
+
 module( "spinner: options" );
 
 // culture is tested after numberFormat, since it depends on numberFormat
diff --git a/tests/unit/spinner/spinner_test_helpers.js b/tests/unit/spinner/spinner_test_helpers.js
index af555dbf2..2021e8f7a 100644
--- a/tests/unit/spinner/spinner_test_helpers.js
+++ b/tests/unit/spinner/spinner_test_helpers.js
@@ -1,5 +1,8 @@
-var spinner_simulateKeyDownUp = function( element, keyCode, shift ) {
-	element
-		.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
-		.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
+TestHelpers.spinner = {
+	simulateKeyDownUp: function( element, keyCode, shift ) {
+		element
+			.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
+			.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
+	}
 };
+
-- 
cgit v1.2.3


From 6150abae49f77a3b2f67c39a3c60a06792b4de8f Mon Sep 17 00:00:00 2001
From: TJ VanToll <tj.vantoll@gmail.com>
Date: Mon, 9 Jan 2012 21:42:56 -0500
Subject: Resizable: Apply zIndex option to all handles. Partial Fix for #7960-
 Modal dialog does not disable resizables on the page.

---
 tests/unit/resizable/resizable_options.js | 9 +++++++++
 themes/base/jquery.ui.resizable.css       | 2 +-
 ui/jquery.ui.resizable.js                 | 5 ++---
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
index 76cca560a..275639ca1 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/resizable_options.js
@@ -187,4 +187,13 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1
 	equal( target.height(), 100, "compare maxHeight" );
 });
 
+test("zIndex, applied to all handles", function() {
+	expect(8);
+	
+	var target = $('<div></div>').resizable({ handles: 'all', zIndex: 100 });
+	target.children( '.ui-resizable-handle' ).each( function( index, handle ) {
+		equals( $( handle ).css( 'zIndex' ), 100, 'compare zIndex' );
+	});
+});
+
 })(jQuery);
diff --git a/themes/base/jquery.ui.resizable.css b/themes/base/jquery.ui.resizable.css
index 0bf680482..0bb688d5b 100644
--- a/themes/base/jquery.ui.resizable.css
+++ b/themes/base/jquery.ui.resizable.css
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Resizable#theming
  */
 .ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
 .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
 .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
 .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 9be33927e..c00602cc8 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -99,9 +99,8 @@ $.widget("ui.resizable", $.ui.mouse, {
 				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
 				var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
 
-				// increase zIndex of sw, se, ne, nw axis
-				//TODO : this modifies original option
-				if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex });
+				// Apply zIndex to all handles - see #7960
+				axis.css({ zIndex: o.zIndex });
 
 				//TODO : What's going on here?
 				if ('se' == handle) {
-- 
cgit v1.2.3


From 33df9b788d3f60459c43acbfefdfeef8a07ce632 Mon Sep 17 00:00:00 2001
From: kborchers <kris.borchers@gmail.com>
Date: Thu, 19 Apr 2012 23:50:52 -0500
Subject: Menu tests: Update tests to test mouseenter instead of mouseover

---
 tests/unit/menu/menu_events.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index a0051c70b..4cb083240 100644
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -87,11 +87,12 @@ test( "handle blur on custom item menu: click", function() {
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
-	var $menu = $( "#menu2" ).menu();
+	var $menu = $( "#menu2" ).menu(),
+		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
 		equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		$menu.find( "li:nth-child(7) li:first" ).trigger( "mouseover" );
+		$menu.menu( "focus", event, $menu.find( "li:nth-child(7) li:first" ) );
 		setTimeout( menumouseleave2, 350 );
 	}
 	function menumouseleave2() {
@@ -109,17 +110,18 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 		start();
 	}
 
-	$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
+	$menu.find( "li:nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 350 );
 });
 
 asyncTest( "handle submenu auto collapse: mouseleave", function() {
 	expect( 4 );
-	var $menu = $( "#menu5" ).menu( { menus: "div" } );
+	var $menu = $( "#menu5" ).menu( { menus: "div" } ),
+		event = $.Event( "mouseenter" );
 
 	function menumouseleave1() {
 		equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
-		$menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ).trigger( "mouseover" );
+		$menu.menu( "focus", event, $menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ) );
 		setTimeout( menumouseleave2, 350 );
 	}
 	function menumouseleave2() {
@@ -137,7 +139,7 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
 		start();
 	}
 
-	$menu.find( ":nth-child(7)" ).trigger( "mouseover" );
+	$menu.find( ":nth-child(7)" ).trigger( "mouseenter" );
 	setTimeout( menumouseleave1, 350 );
 
 });
-- 
cgit v1.2.3


From 31f3d0e6a3af33918cad6f0a12efecc522740d47 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 20 Apr 2012 11:20:50 -0400
Subject: Resizabe tests: Use equal() instead of equals().

---
 tests/unit/resizable/resizable_options.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
index 275639ca1..e10a55a31 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/resizable_options.js
@@ -189,10 +189,10 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1
 
 test("zIndex, applied to all handles", function() {
 	expect(8);
-	
+
 	var target = $('<div></div>').resizable({ handles: 'all', zIndex: 100 });
 	target.children( '.ui-resizable-handle' ).each( function( index, handle ) {
-		equals( $( handle ).css( 'zIndex' ), 100, 'compare zIndex' );
+		equal( $( handle ).css( 'zIndex' ), 100, 'compare zIndex' );
 	});
 });
 
-- 
cgit v1.2.3


From c090fe9486700e1c10defba35f272e78459ad566 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 20 Apr 2012 11:23:37 -0400
Subject: Resizable tests: Remove all bad tests.

---
 tests/unit/resizable/resizable_defaults.js |  5 ++-
 tests/unit/resizable/resizable_events.js   | 12 -------
 tests/unit/resizable/resizable_methods.js  | 55 ------------------------------
 3 files changed, 4 insertions(+), 68 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/resizable/resizable_defaults.js b/tests/unit/resizable/resizable_defaults.js
index c46e10781..617cdd2ad 100644
--- a/tests/unit/resizable/resizable_defaults.js
+++ b/tests/unit/resizable/resizable_defaults.js
@@ -19,6 +19,9 @@ TestHelpers.commonWidgetTests('resizable', {
 		maxWidth: null,
 		minHeight: 10,
 		minWidth: 10,
-		zIndex: 1000
+		zIndex: 1000,
+
+		// callbacks
+		create: null
 	}
 });
diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js
index e8041f064..52d55731c 100644
--- a/tests/unit/resizable/resizable_events.js
+++ b/tests/unit/resizable/resizable_events.js
@@ -5,16 +5,4 @@
 
 module("resizable: events");
 
-test("start", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("resize", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("stop", function() {
-	ok(false, "missing test - untested code is broken code.");
-});
-
 })(jQuery);
diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/resizable_methods.js
index 2b4c4256c..87859acf7 100644
--- a/tests/unit/resizable/resizable_methods.js
+++ b/tests/unit/resizable/resizable_methods.js
@@ -5,60 +5,5 @@
 
 module("resizable: methods");
 
-test("init", function() {
-	expect(6);
-
-	$("<div></div>").appendTo('body').resizable().remove();
-	ok(true, '.resizable() called on element');
-
-	$([]).resizable().remove();
-	ok(true, '.resizable() called on empty collection');
-
-	$('<div></div>').resizable().remove();
-	ok(true, '.resizable() called on disconnected DOMElement');
-
-	$('<div></div>').resizable().resizable("foo").remove();
-	ok(true, 'arbitrary method called after init');
-
-	el = $('<div></div>').resizable();
-	var foo = el.resizable("option", "foo");
-	el.remove();
-	ok(true, 'arbitrary option getter after init');
-
-	$('<div></div>').resizable().resizable("option", "foo", "bar").remove();
-	ok(true, 'arbitrary option setter after init');
-});
-
-test("destroy", function() {
-	$("<div></div>").appendTo('body').resizable().resizable("destroy").remove();
-	ok(true, '.resizable("destroy") called on element');
-
-	$([]).resizable().resizable("destroy").remove();
-	ok(true, '.resizable("destroy") called on empty collection');
-
-	$('<div></div>').resizable().resizable("destroy").remove();
-	ok(true, '.resizable("destroy") called on disconnected DOMElement');
-
-	$('<div></div>').resizable().resizable("destroy").resizable("foo").remove();
-	ok(true, 'arbitrary method called after destroy');
-
-	var expected = $('<div></div>').resizable(),
-		actual = expected.resizable('destroy');
-	equal(actual, expected, 'destroy is chainable');
-});
-
-test("enable", function() {
-	var expected = $('<div></div>').resizable(),
-		actual = expected.resizable('enable');
-	equal(actual, expected, 'enable is chainable');
-	ok(false, "missing test - untested code is broken code.");
-});
-
-test("disable", function() {
-	var expected = $('<div></div>').resizable(),
-		actual = expected.resizable('disable');
-	equal(actual, expected, 'disable is chainable');
-	ok(false, "missing test - untested code is broken code.");
-});
 
 })(jQuery);
-- 
cgit v1.2.3


From ce3c7fab938c755b10d5e55bddccdde1be4819f1 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Sat, 21 Apr 2012 17:49:11 +0200
Subject: Update to official qunit composite addon

---
 tests/unit/accordion/all.html    |   4 +-
 tests/unit/all-active.html       |   4 +-
 tests/unit/all.html              |   4 +-
 tests/unit/autocomplete/all.html |   4 +-
 tests/unit/button/all.html       |   4 +-
 tests/unit/core/all.html         |   4 +-
 tests/unit/datepicker/all.html   |   4 +-
 tests/unit/dialog/all.html       |   4 +-
 tests/unit/draggable/all.html    |   4 +-
 tests/unit/droppable/all.html    |   4 +-
 tests/unit/effects/all.html      |   4 +-
 tests/unit/menu/all.html         |   4 +-
 tests/unit/position/all.html     |   4 +-
 tests/unit/progressbar/all.html  |   4 +-
 tests/unit/qunit-composite.css   |  13 +++++
 tests/unit/qunit-composite.js    | 102 +++++++++++++++++++++++++++++++++++++++
 tests/unit/resizable/all.html    |   4 +-
 tests/unit/selectable/all.html   |   4 +-
 tests/unit/slider/all.html       |   4 +-
 tests/unit/sortable/all.html     |   4 +-
 tests/unit/spinner/all.html      |   4 +-
 tests/unit/subsuiteRunner.css    |   8 ---
 tests/unit/subsuiteRunner.js     |  88 ---------------------------------
 tests/unit/tabs/all.html         |   4 +-
 tests/unit/tooltip/all.html      |   4 +-
 tests/unit/widget/all.html       |   4 +-
 26 files changed, 159 insertions(+), 140 deletions(-)
 create mode 100644 tests/unit/qunit-composite.css
 create mode 100644 tests/unit/qunit-composite.js
 delete mode 100644 tests/unit/subsuiteRunner.css
 delete mode 100644 tests/unit/subsuiteRunner.js

(limited to 'tests/unit')

diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html
index ec9c003d9..2fb783c1c 100644
--- a/tests/unit/accordion/all.html
+++ b/tests/unit/accordion/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/all-active.html b/tests/unit/all-active.html
index 89c10441d..b3e2fbcba 100644
--- a/tests/unit/all-active.html
+++ b/tests/unit/all-active.html
@@ -7,9 +7,9 @@
 	<script src="../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../external/qunit.css">
-	<link rel="stylesheet" href="subsuiteRunner.css">
+	<link rel="stylesheet" href="qunit-composite.css">
 	<script src="../../external/qunit.js"></script>
-	<script src="subsuiteRunner.js"></script>
+	<script src="qunit-composite.js"></script>
 
 	<script>
 	(function() {
diff --git a/tests/unit/all.html b/tests/unit/all.html
index e48b1ac0e..6d98df0f9 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -7,9 +7,9 @@
 	<script src="../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../external/qunit.css">
-	<link rel="stylesheet" href="subsuiteRunner.css">
+	<link rel="stylesheet" href="qunit-composite.css">
 	<script src="../../external/qunit.js"></script>
-	<script src="subsuiteRunner.js"></script>
+	<script src="qunit-composite.js"></script>
 
 	<script>
 	(function() {
diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html
index 87cde75fb..e35777f65 100644
--- a/tests/unit/autocomplete/all.html
+++ b/tests/unit/autocomplete/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/button/all.html b/tests/unit/button/all.html
index 115743e94..6c46c9650 100644
--- a/tests/unit/button/all.html
+++ b/tests/unit/button/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/core/all.html b/tests/unit/core/all.html
index 78bbe9aef..e31d6905c 100644
--- a/tests/unit/core/all.html
+++ b/tests/unit/core/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html
index 1540705f8..c62c7c07d 100644
--- a/tests/unit/datepicker/all.html
+++ b/tests/unit/datepicker/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/dialog/all.html b/tests/unit/dialog/all.html
index 973119c08..b1c69c6c9 100644
--- a/tests/unit/dialog/all.html
+++ b/tests/unit/dialog/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/draggable/all.html b/tests/unit/draggable/all.html
index 1b2a511a5..75df351ad 100644
--- a/tests/unit/draggable/all.html
+++ b/tests/unit/draggable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/droppable/all.html b/tests/unit/droppable/all.html
index 535f41521..aa24ed7e1 100644
--- a/tests/unit/droppable/all.html
+++ b/tests/unit/droppable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/effects/all.html b/tests/unit/effects/all.html
index 0ef901292..59500588c 100644
--- a/tests/unit/effects/all.html
+++ b/tests/unit/effects/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/menu/all.html b/tests/unit/menu/all.html
index a58e15299..475c1b717 100644
--- a/tests/unit/menu/all.html
+++ b/tests/unit/menu/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/position/all.html b/tests/unit/position/all.html
index fa3ecf23d..d76f9bbd8 100644
--- a/tests/unit/position/all.html
+++ b/tests/unit/position/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html
index eefb9c135..16b9e0ace 100644
--- a/tests/unit/progressbar/all.html
+++ b/tests/unit/progressbar/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/qunit-composite.css b/tests/unit/qunit-composite.css
new file mode 100644
index 000000000..df47362db
--- /dev/null
+++ b/tests/unit/qunit-composite.css
@@ -0,0 +1,13 @@
+iframe.qunit-subsuite{
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    
+    margin: 0;
+    padding: 0;
+    border-width: 1px 0 0;
+    height: 45%;
+    width: 100%;
+
+    background: #fff;
+}
\ No newline at end of file
diff --git a/tests/unit/qunit-composite.js b/tests/unit/qunit-composite.js
new file mode 100644
index 000000000..5b753e2ee
--- /dev/null
+++ b/tests/unit/qunit-composite.js
@@ -0,0 +1,102 @@
+(function( QUnit ) {
+
+QUnit.extend( QUnit, {
+	testSuites: function( suites ) {
+		QUnit.begin(function() {
+			QUnit.initIframe();
+		});
+
+		for ( var i = 0; i < suites.length; i++ ) {
+			(function( suite ) {
+				asyncTest( suite, function() {
+					QUnit.runSuite( suite );
+				});
+			}( suites[i] ) );
+		}
+		QUnit.done(function() {
+			this.iframe.style.display = "none";
+		});
+	},
+
+	runSuite: function( suite ) {
+		this.iframe.setAttribute( "src", suite );
+	},
+
+	initIframe: function() {
+		var body = document.body,
+			iframe = this.iframe = document.createElement( "iframe" ),
+			iframeWin;
+
+		iframe.className = "qunit-subsuite";
+		body.appendChild( iframe );
+
+		function onIframeLoad() {
+			var module, test,
+				count = 0;
+
+
+			iframeWin.QUnit.moduleStart(function( data ) {
+				// capture module name for messages
+				module = data.name;
+			});
+
+			iframeWin.QUnit.testStart(function( data ) {
+				// capture test name for messages
+				test = data.name;
+			});
+			iframeWin.QUnit.testDone(function() {
+				test = null;
+			});
+
+			iframeWin.QUnit.log(function( data ) {
+				if (test === null) {
+					return;
+				}
+				// pass all test details through to the main page
+				var message = module + ": " + test + ": " + data.message;
+				expect( ++count );
+				QUnit.push( data.result, data.actual, data.expected, message );
+			});
+
+			iframeWin.QUnit.done(function() {
+				// start the wrapper test from the main page
+				start();
+			});
+		}
+		QUnit.addEvent( iframe, "load", onIframeLoad );
+
+		iframeWin = iframe.contentWindow;
+	}
+});
+
+QUnit.testStart(function( data ) {
+	// update the test status to show which test suite is running
+	QUnit.id( "qunit-testresult" ).innerHTML = "Running " + data.name + "...<br>&nbsp;";
+});
+
+QUnit.testDone(function() {
+	var current = QUnit.id( this.config.current.id ),
+		children = current.children,
+		src = this.iframe.src;
+
+	// undo the auto-expansion of failed tests
+	for ( var i = 0; i < children.length; i++ ) {
+		if ( children[i].nodeName === "OL" ) {
+			children[i].style.display = "none";
+		}
+	}
+
+	QUnit.addEvent(current, "dblclick", function( e ) {
+		var target = e && e.target ? e.target : window.event.srcElement;
+		if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
+			target = target.parentNode;
+		}
+		if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+			window.location = src;
+		}
+	});
+
+	current.getElementsByTagName('a')[0].href = src;
+});
+
+}( QUnit ) );
diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html
index 1c6811282..bef29ff6e 100644
--- a/tests/unit/resizable/all.html
+++ b/tests/unit/resizable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html
index bfebf46c2..51778e771 100644
--- a/tests/unit/selectable/all.html
+++ b/tests/unit/selectable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/slider/all.html b/tests/unit/slider/all.html
index 5aac26ced..bfadc0380 100644
--- a/tests/unit/slider/all.html
+++ b/tests/unit/slider/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/sortable/all.html b/tests/unit/sortable/all.html
index 89e239250..f9d63d62e 100644
--- a/tests/unit/sortable/all.html
+++ b/tests/unit/sortable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/spinner/all.html b/tests/unit/spinner/all.html
index e41e088c4..72a2dd77a 100644
--- a/tests/unit/spinner/all.html
+++ b/tests/unit/spinner/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/subsuiteRunner.css b/tests/unit/subsuiteRunner.css
deleted file mode 100644
index bca30a75e..000000000
--- a/tests/unit/subsuiteRunner.css
+++ /dev/null
@@ -1,8 +0,0 @@
-iframe.qunit-subsuite {
-	margin: 0;
-	padding: 0;
-	border-width: 1px 0 0;
-	height: 600px;
-	width: 100%;
-	background: #fff;
-}
\ No newline at end of file
diff --git a/tests/unit/subsuiteRunner.js b/tests/unit/subsuiteRunner.js
deleted file mode 100644
index 2d6de2de1..000000000
--- a/tests/unit/subsuiteRunner.js
+++ /dev/null
@@ -1,88 +0,0 @@
-(function( QUnit ) {
-
-var subsuiteFrame;
-
-QUnit.extend( QUnit, {
-	testSuites: function( suites ) {
-		function generateSuite( suite ) {
-			asyncTest( suite, function() {
-				QUnit.runSuite( suite );
-			});
-		}
-
-		for ( var i = 0; i < suites.length; i++ ) {
-			generateSuite( suites[ i ] );
-		}
-
-		QUnit.done = function() {
-			subsuiteFrame.style.display = "none";
-		};
-	},
-
-	testStart: function( data ) {
-		// update the test status to show which test suite is running
-		QUnit.id( "qunit-testresult" ).innerHTML = "Running " + data.name + "...<br>&nbsp;";
-	},
-
-	testDone: function() {
-		var current = QUnit.id( this.config.current.id ),
-			children = current.children,
-			i = 0,
-			length = children.length;
-
-		// undo the auto-expansion of failed tests
-		for ( ; i < length; i++ ) {
-			if ( children[i].nodeName === "OL" ) {
-				children[i].style.display = "none";
-			}
-		}
-	},
-
-	runSuite: function( suite ) {
-		var iframeWin,
-			body = document.getElementsByTagName( "body" )[0],
-			iframe = document.createElement( "iframe" );
-
-		subsuiteFrame = iframe;
-		iframe.className = "qunit-subsuite";
-		body.appendChild( iframe );
-
-		function onIframeLoad() {
-			var module, test,
-				count = 0;
-
-			QUnit.extend( iframeWin.QUnit, {
-				moduleStart: function( data ) {
-					// capture module name for messages
-					module = data.name;
-				},
-
-				testStart: function( data ) {
-					// capture test name for messages
-					test = data.name;
-				},
-
-				log: function( data ) {
-					// pass all test details through to the main page
-					var message = module + ": " + test + ": " + data.message;
-					expect( ++count );
-					QUnit.push( data.result, data.actual, data.expected, message );
-				},
-
-				done: function() {
-					// start the wrapper test from the main page
-					start();
-				}
-			});
-		}
-		QUnit.addEvent( iframe, "load", onIframeLoad );
-
-		iframeWin = iframe.contentWindow;
-		iframe.setAttribute( "src", suite );
-
-		this.runSuite = function( suite ) {
-			iframe.setAttribute( "src", suite );
-		};
-	}
-});
-}( QUnit ) );
diff --git a/tests/unit/tabs/all.html b/tests/unit/tabs/all.html
index 1da3ecad2..41bf965f2 100644
--- a/tests/unit/tabs/all.html
+++ b/tests/unit/tabs/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html
index deb628e2f..c1aa35acf 100644
--- a/tests/unit/tooltip/all.html
+++ b/tests/unit/tooltip/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html
index cad4bdd72..e5b16c8d7 100644
--- a/tests/unit/widget/all.html
+++ b/tests/unit/widget/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
-- 
cgit v1.2.3


From 7ec8c7fbbca32a38d4afa87392c4e269482370a1 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Sun, 22 Apr 2012 12:47:33 +0200
Subject: Update to latest qunit-composite

---
 tests/unit/qunit-composite.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/qunit-composite.js b/tests/unit/qunit-composite.js
index 5b753e2ee..89c47eb29 100644
--- a/tests/unit/qunit-composite.js
+++ b/tests/unit/qunit-composite.js
@@ -7,19 +7,18 @@ QUnit.extend( QUnit, {
 		});
 
 		for ( var i = 0; i < suites.length; i++ ) {
-			(function( suite ) {
-				asyncTest( suite, function() {
-					QUnit.runSuite( suite );
-				});
-			}( suites[i] ) );
+			QUnit.runSuite( suites[i] );
 		}
+
 		QUnit.done(function() {
 			this.iframe.style.display = "none";
 		});
 	},
 
 	runSuite: function( suite ) {
-		this.iframe.setAttribute( "src", suite );
+		asyncTest( suite, function() {
+			QUnit.iframe.setAttribute( "src", suite );
+		});
 	},
 
 	initIframe: function() {
@@ -75,12 +74,13 @@ QUnit.testStart(function( data ) {
 });
 
 QUnit.testDone(function() {
-	var current = QUnit.id( this.config.current.id ),
+	var i,
+		current = QUnit.id( this.config.current.id ),
 		children = current.children,
 		src = this.iframe.src;
 
 	// undo the auto-expansion of failed tests
-	for ( var i = 0; i < children.length; i++ ) {
+	for ( i = 0; i < children.length; i++ ) {
 		if ( children[i].nodeName === "OL" ) {
 			children[i].style.display = "none";
 		}
@@ -88,7 +88,7 @@ QUnit.testDone(function() {
 
 	QUnit.addEvent(current, "dblclick", function( e ) {
 		var target = e && e.target ? e.target : window.event.srcElement;
-		if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
+		if ( target.nodeName.toLowerCase() === "span" || target.nodeName.toLowerCase() === "b" ) {
 			target = target.parentNode;
 		}
 		if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
-- 
cgit v1.2.3


From 3b54760b51fde0e541d2b47c34475ab29a4eea79 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 08:44:55 -0400
Subject: Tests: Run JSHint in unit tests, unless nojshint=1 is specified in
 the query string.

---
 external/jshint.js       | 4390 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/resource_loader.js |    5 +-
 tests/unit/testsuite.js  |   39 +-
 3 files changed, 4430 insertions(+), 4 deletions(-)
 create mode 100644 external/jshint.js

(limited to 'tests/unit')

diff --git a/external/jshint.js b/external/jshint.js
new file mode 100644
index 000000000..5bf937c4b
--- /dev/null
+++ b/external/jshint.js
@@ -0,0 +1,4390 @@
+/*!
+ * JSHint, by JSHint Community.
+ *
+ * Licensed under the same slightly modified MIT license that JSLint is.
+ * It stops evil-doers everywhere.
+ *
+ * JSHint is a derivative work of JSLint:
+ *
+ *   Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining
+ *   a copy of this software and associated documentation files (the "Software"),
+ *   to deal in the Software without restriction, including without limitation
+ *   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *   and/or sell copies of the Software, and to permit persons to whom
+ *   the Software is furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included
+ *   in all copies or substantial portions of the Software.
+ *
+ *   The Software shall be used for Good, not Evil.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *   DEALINGS IN THE SOFTWARE.
+ *
+ * JSHint was forked from 2010-12-16 edition of JSLint.
+ *
+ */
+
+/*
+ JSHINT is a global function. It takes two parameters.
+
+     var myResult = JSHINT(source, option);
+
+ The first parameter is either a string or an array of strings. If it is a
+ string, it will be split on '\n' or '\r'. If it is an array of strings, it
+ is assumed that each string represents one line. The source can be a
+ JavaScript text or a JSON text.
+
+ The second parameter is an optional object of options which control the
+ operation of JSHINT. Most of the options are booleans: They are all
+ optional and have a default value of false. One of the options, predef,
+ can be an array of names, which will be used to declare global variables,
+ or an object whose keys are used as global names, with a boolean value
+ that determines if they are assignable.
+
+ If it checks out, JSHINT returns true. Otherwise, it returns false.
+
+ If false, you can inspect JSHINT.errors to find out the problems.
+ JSHINT.errors is an array of objects containing these members:
+
+ {
+     line      : The line (relative to 0) at which the lint was found
+     character : The character (relative to 0) at which the lint was found
+     reason    : The problem
+     evidence  : The text line in which the problem occurred
+     raw       : The raw message before the details were inserted
+     a         : The first detail
+     b         : The second detail
+     c         : The third detail
+     d         : The fourth detail
+ }
+
+ If a fatal error was found, a null will be the last element of the
+ JSHINT.errors array.
+
+ You can request a Function Report, which shows all of the functions
+ and the parameters and vars that they use. This can be used to find
+ implied global variables and other problems. The report is in HTML and
+ can be inserted in an HTML <body>.
+
+     var myReport = JSHINT.report(limited);
+
+ If limited is true, then the report will be limited to only errors.
+
+ You can request a data structure which contains JSHint's results.
+
+     var myData = JSHINT.data();
+
+ It returns a structure with this form:
+
+ {
+     errors: [
+         {
+             line: NUMBER,
+             character: NUMBER,
+             reason: STRING,
+             evidence: STRING
+         }
+     ],
+     functions: [
+         name: STRING,
+         line: NUMBER,
+         last: NUMBER,
+         param: [
+             STRING
+         ],
+         closure: [
+             STRING
+         ],
+         var: [
+             STRING
+         ],
+         exception: [
+             STRING
+         ],
+         outer: [
+             STRING
+         ],
+         unused: [
+             STRING
+         ],
+         global: [
+             STRING
+         ],
+         label: [
+             STRING
+         ]
+     ],
+     globals: [
+         STRING
+     ],
+     member: {
+         STRING: NUMBER
+     },
+     unused: [
+         {
+             name: STRING,
+             line: NUMBER
+         }
+     ],
+     implieds: [
+         {
+             name: STRING,
+             line: NUMBER
+         }
+     ],
+     urls: [
+         STRING
+     ],
+     json: BOOLEAN
+ }
+
+ Empty arrays will not be included.
+
+*/
+
+/*jshint
+ evil: true, nomen: false, onevar: false, regexp: false, strict: true, boss: true,
+ undef: true, maxlen: 100, indent:4
+*/
+
+/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%", "(begin)",
+ "(breakage)", "(context)", "(error)", "(global)", "(identifier)", "(last)",
+ "(line)", "(loopage)", "(name)", "(onevar)", "(params)", "(scope)",
+ "(statement)", "(verb)", "*", "+", "++", "-", "--", "\/", "<", "<=", "==",
+ "===", ">", ">=", $, $$, $A, $F, $H, $R, $break, $continue, $w, Abstract, Ajax,
+ __filename, __dirname, ActiveXObject, Array, ArrayBuffer, ArrayBufferView, Audio,
+ Autocompleter, Assets, Boolean, Builder, Buffer, Browser, COM, CScript, Canvas,
+ CustomAnimation, Class, Control, Chain, Color, Cookie, Core, DataView, Date,
+ Debug, Draggable, Draggables, Droppables, Document, DomReady, DOMReady, Drag,
+ E, Enumerator, Enumerable, Element, Elements, Error, Effect, EvalError, Event,
+ Events, FadeAnimation, Field, Flash, Float32Array, Float64Array, Form,
+ FormField, Frame, FormData, Function, Fx, GetObject, Group, Hash, HotKey,
+ HTMLElement, HTMLAnchorElement, HTMLBaseElement, HTMLBlockquoteElement,
+ HTMLBodyElement, HTMLBRElement, HTMLButtonElement, HTMLCanvasElement, HTMLDirectoryElement,
+ HTMLDivElement, HTMLDListElement, HTMLFieldSetElement,
+ HTMLFontElement, HTMLFormElement, HTMLFrameElement, HTMLFrameSetElement,
+ HTMLHeadElement, HTMLHeadingElement, HTMLHRElement, HTMLHtmlElement,
+ HTMLIFrameElement, HTMLImageElement, HTMLInputElement, HTMLIsIndexElement,
+ HTMLLabelElement, HTMLLayerElement, HTMLLegendElement, HTMLLIElement,
+ HTMLLinkElement, HTMLMapElement, HTMLMenuElement, HTMLMetaElement,
+ HTMLModElement, HTMLObjectElement, HTMLOListElement, HTMLOptGroupElement,
+ HTMLOptionElement, HTMLParagraphElement, HTMLParamElement, HTMLPreElement,
+ HTMLQuoteElement, HTMLScriptElement, HTMLSelectElement, HTMLStyleElement,
+ HtmlTable, HTMLTableCaptionElement, HTMLTableCellElement, HTMLTableColElement,
+ HTMLTableElement, HTMLTableRowElement, HTMLTableSectionElement,
+ HTMLTextAreaElement, HTMLTitleElement, HTMLUListElement, HTMLVideoElement,
+ Iframe, IframeShim, Image, Int16Array, Int32Array, Int8Array,
+ Insertion, InputValidator, JSON, Keyboard, Locale, LN10, LN2, LOG10E, LOG2E,
+ MAX_VALUE, MIN_VALUE, Mask, Math, MenuItem, MoveAnimation, MooTools, Native,
+ NEGATIVE_INFINITY, Number, Object, ObjectRange, Option, Options, OverText, PI,
+ POSITIVE_INFINITY, PeriodicalExecuter, Point, Position, Prototype, RangeError,
+ Rectangle, ReferenceError, RegExp, ResizeAnimation, Request, RotateAnimation,
+ SQRT1_2, SQRT2, ScrollBar, ScriptEngine, ScriptEngineBuildVersion,
+ ScriptEngineMajorVersion, ScriptEngineMinorVersion, Scriptaculous, Scroller,
+ Slick, Slider, Selector, SharedWorker, String, Style, SyntaxError, Sortable, Sortables,
+ SortableObserver, Sound, Spinner, System, Swiff, Text, TextArea, Template,
+ Timer, Tips, Type, TypeError, Toggle, Try, "use strict", unescape, URI, URIError, URL,
+ VBArray, WSH, WScript, XDomainRequest, Web, Window, XMLDOM, XMLHttpRequest, XPathEvaluator,
+ XPathException, XPathExpression, XPathNamespace, XPathNSResolver, XPathResult, "\\", a,
+ addEventListener, address, alert, apply, applicationCache, arguments, arity,
+ asi, b, basic, basicToken, bitwise, block, blur, boolOptions, boss, browser, c, call, callee,
+ caller, cases, charAt, charCodeAt, character, clearInterval, clearTimeout,
+ close, closed, closure, comment, condition, confirm, console, constructor,
+ content, couch, create, css, curly, d, data, datalist, dd, debug, decodeURI,
+ decodeURIComponent, defaultStatus, defineClass, deserialize, devel, document,
+ dojo, dijit, dojox, define, else, emit, encodeURI, encodeURIComponent,
+ entityify, eqeqeq, eqnull, errors, es5, escape, esnext, eval, event, evidence, evil,
+ ex, exception, exec, exps, expr, exports, FileReader, first, floor, focus,
+ forin, fragment, frames, from, fromCharCode, fud, funcscope, funct, function, functions,
+ g, gc, getComputedStyle, getRow, getter, getterToken, GLOBAL, global, globals, globalstrict,
+ hasOwnProperty, help, history, i, id, identifier, immed, implieds, importPackage, include,
+ indent, indexOf, init, ins, instanceOf, isAlpha, isApplicationRunning, isArray,
+ isDigit, isFinite, isNaN, iterator, java, join, jshint,
+ JSHINT, json, jquery, jQuery, keys, label, labelled, last, lastsemic, laxbreak, laxcomma,
+ latedef, lbp, led, left, length, line, load, loadClass, localStorage, location,
+ log, loopfunc, m, match, maxerr, maxlen, member,message, meta, module, moveBy,
+ moveTo, mootools, multistr, name, navigator, new, newcap, noarg, node, noempty, nomen,
+ nonew, nonstandard, nud, onbeforeunload, onblur, onerror, onevar, onecase, onfocus,
+ onload, onresize, onunload, open, openDatabase, openURL, opener, opera, options, outer, param,
+ parent, parseFloat, parseInt, passfail, plusplus, predef, print, process, prompt,
+ proto, prototype, prototypejs, provides, push, quit, range, raw, reach, reason, regexp,
+ readFile, readUrl, regexdash, removeEventListener, replace, report, require,
+ reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, respond, rhino, right,
+ runCommand, scroll, screen, scripturl, scrollBy, scrollTo, scrollbar, search, seal,
+ send, serialize, sessionStorage, setInterval, setTimeout, setter, setterToken, shift, slice,
+ smarttabs, sort, spawn, split, stack, status, start, strict, sub, substr, supernew, shadow,
+ supplant, sum, sync, test, toLowerCase, toString, toUpperCase, toint32, token, top, trailing,
+ type, typeOf, Uint16Array, Uint32Array, Uint8Array, undef, undefs, unused, urls, validthis,
+ value, valueOf, var, version, WebSocket, white, window, Worker, wsh*/
+
+/*global exports: false */
+
+// We build the application inside a function so that we produce only a single
+// global variable. That function will be invoked immediately, and its return
+// value is the JSHINT function itself.
+
+var JSHINT = (function () {
+    "use strict";
+
+    var anonname,       // The guessed name for anonymous functions.
+
+// These are operators that should not be used with the ! operator.
+
+        bang = {
+            '<'  : true,
+            '<=' : true,
+            '==' : true,
+            '===': true,
+            '!==': true,
+            '!=' : true,
+            '>'  : true,
+            '>=' : true,
+            '+'  : true,
+            '-'  : true,
+            '*'  : true,
+            '/'  : true,
+            '%'  : true
+        },
+
+        // These are the JSHint boolean options.
+        boolOptions = {
+            asi         : true, // if automatic semicolon insertion should be tolerated
+            bitwise     : true, // if bitwise operators should not be allowed
+            boss        : true, // if advanced usage of assignments should be allowed
+            browser     : true, // if the standard browser globals should be predefined
+            couch       : true, // if CouchDB globals should be predefined
+            curly       : true, // if curly braces around all blocks should be required
+            debug       : true, // if debugger statements should be allowed
+            devel       : true, // if logging globals should be predefined (console,
+                                // alert, etc.)
+            dojo        : true, // if Dojo Toolkit globals should be predefined
+            eqeqeq      : true, // if === should be required
+            eqnull      : true, // if == null comparisons should be tolerated
+            es5         : true, // if ES5 syntax should be allowed
+            esnext      : true, // if es.next specific syntax should be allowed
+            evil        : true, // if eval should be allowed
+            expr        : true, // if ExpressionStatement should be allowed as Programs
+            forin       : true, // if for in statements must filter
+            funcscope   : true, // if only function scope should be used for scope tests
+            globalstrict: true, // if global "use strict"; should be allowed (also
+                                // enables 'strict')
+            immed       : true, // if immediate invocations must be wrapped in parens
+            iterator    : true, // if the `__iterator__` property should be allowed
+            jquery      : true, // if jQuery globals should be predefined
+            lastsemic   : true, // if semicolons may be ommitted for the trailing
+                                // statements inside of a one-line blocks.
+            latedef     : true, // if the use before definition should not be tolerated
+            laxbreak    : true, // if line breaks should not be checked
+            laxcomma    : true, // if line breaks should not be checked around commas
+            loopfunc    : true, // if functions should be allowed to be defined within
+                                // loops
+            mootools    : true, // if MooTools globals should be predefined
+            multistr    : true, // allow multiline strings
+            newcap      : true, // if constructor names must be capitalized
+            noarg       : true, // if arguments.caller and arguments.callee should be
+                                // disallowed
+            node        : true, // if the Node.js environment globals should be
+                                // predefined
+            noempty     : true, // if empty blocks should be disallowed
+            nonew       : true, // if using `new` for side-effects should be disallowed
+            nonstandard : true, // if non-standard (but widely adopted) globals should
+                                // be predefined
+            nomen       : true, // if names should be checked
+            onevar      : true, // if only one var statement per function should be
+                                // allowed
+            onecase     : true, // if one case switch statements should be allowed
+            passfail    : true, // if the scan should stop on first error
+            plusplus    : true, // if increment/decrement should not be allowed
+            proto       : true, // if the `__proto__` property should be allowed
+            prototypejs : true, // if Prototype and Scriptaculous globals should be
+                                // predefined
+            regexdash   : true, // if unescaped first/last dash (-) inside brackets
+                                // should be tolerated
+            regexp      : true, // if the . should not be allowed in regexp literals
+            rhino       : true, // if the Rhino environment globals should be predefined
+            undef       : true, // if variables should be declared before used
+            scripturl   : true, // if script-targeted URLs should be tolerated
+            shadow      : true, // if variable shadowing should be tolerated
+            smarttabs   : true, // if smarttabs should be tolerated
+                                // (http://www.emacswiki.org/emacs/SmartTabs)
+            strict      : true, // require the "use strict"; pragma
+            sub         : true, // if all forms of subscript notation are tolerated
+            supernew    : true, // if `new function () { ... };` and `new Object;`
+                                // should be tolerated
+            trailing    : true, // if trailing whitespace rules apply
+            validthis   : true, // if 'this' inside a non-constructor function is valid.
+                                // This is a function scoped option only.
+            white       : true, // if strict whitespace rules apply
+            wsh         : true  // if the Windows Scripting Host environment globals
+                                // should be predefined
+        },
+
+        // browser contains a set of global names which are commonly provided by a
+        // web browser environment.
+        browser = {
+            ArrayBuffer              :  false,
+            ArrayBufferView          :  false,
+            Audio                    :  false,
+            addEventListener         :  false,
+            applicationCache         :  false,
+            blur                     :  false,
+            clearInterval            :  false,
+            clearTimeout             :  false,
+            close                    :  false,
+            closed                   :  false,
+            DataView                 :  false,
+            defaultStatus            :  false,
+            document                 :  false,
+            event                    :  false,
+            FileReader               :  false,
+            Float32Array             :  false,
+            Float64Array             :  false,
+            FormData                 :  false,
+            focus                    :  false,
+            frames                   :  false,
+            getComputedStyle         :  false,
+            HTMLElement              :  false,
+            HTMLAnchorElement        :  false,
+            HTMLBaseElement          :  false,
+            HTMLBlockquoteElement    :  false,
+            HTMLBodyElement          :  false,
+            HTMLBRElement            :  false,
+            HTMLButtonElement        :  false,
+            HTMLCanvasElement        :  false,
+            HTMLDirectoryElement     :  false,
+            HTMLDivElement           :  false,
+            HTMLDListElement         :  false,
+            HTMLFieldSetElement      :  false,
+            HTMLFontElement          :  false,
+            HTMLFormElement          :  false,
+            HTMLFrameElement         :  false,
+            HTMLFrameSetElement      :  false,
+            HTMLHeadElement          :  false,
+            HTMLHeadingElement       :  false,
+            HTMLHRElement            :  false,
+            HTMLHtmlElement          :  false,
+            HTMLIFrameElement        :  false,
+            HTMLImageElement         :  false,
+            HTMLInputElement         :  false,
+            HTMLIsIndexElement       :  false,
+            HTMLLabelElement         :  false,
+            HTMLLayerElement         :  false,
+            HTMLLegendElement        :  false,
+            HTMLLIElement            :  false,
+            HTMLLinkElement          :  false,
+            HTMLMapElement           :  false,
+            HTMLMenuElement          :  false,
+            HTMLMetaElement          :  false,
+            HTMLModElement           :  false,
+            HTMLObjectElement        :  false,
+            HTMLOListElement         :  false,
+            HTMLOptGroupElement      :  false,
+            HTMLOptionElement        :  false,
+            HTMLParagraphElement     :  false,
+            HTMLParamElement         :  false,
+            HTMLPreElement           :  false,
+            HTMLQuoteElement         :  false,
+            HTMLScriptElement        :  false,
+            HTMLSelectElement        :  false,
+            HTMLStyleElement         :  false,
+            HTMLTableCaptionElement  :  false,
+            HTMLTableCellElement     :  false,
+            HTMLTableColElement      :  false,
+            HTMLTableElement         :  false,
+            HTMLTableRowElement      :  false,
+            HTMLTableSectionElement  :  false,
+            HTMLTextAreaElement      :  false,
+            HTMLTitleElement         :  false,
+            HTMLUListElement         :  false,
+            HTMLVideoElement         :  false,
+            history                  :  false,
+            Int16Array               :  false,
+            Int32Array               :  false,
+            Int8Array                :  false,
+            Image                    :  false,
+            length                   :  false,
+            localStorage             :  false,
+            location                 :  false,
+            moveBy                   :  false,
+            moveTo                   :  false,
+            name                     :  false,
+            navigator                :  false,
+            onbeforeunload           :  true,
+            onblur                   :  true,
+            onerror                  :  true,
+            onfocus                  :  true,
+            onload                   :  true,
+            onresize                 :  true,
+            onunload                 :  true,
+            open                     :  false,
+            openDatabase             :  false,
+            opener                   :  false,
+            Option                   :  false,
+            parent                   :  false,
+            print                    :  false,
+            removeEventListener      :  false,
+            resizeBy                 :  false,
+            resizeTo                 :  false,
+            screen                   :  false,
+            scroll                   :  false,
+            scrollBy                 :  false,
+            scrollTo                 :  false,
+            sessionStorage           :  false,
+            setInterval              :  false,
+            setTimeout               :  false,
+            SharedWorker             :  false,
+            status                   :  false,
+            top                      :  false,
+            Uint16Array              :  false,
+            Uint32Array              :  false,
+            Uint8Array               :  false,
+            WebSocket                :  false,
+            window                   :  false,
+            Worker                   :  false,
+            XMLHttpRequest           :  false,
+            XPathEvaluator           :  false,
+            XPathException           :  false,
+            XPathExpression          :  false,
+            XPathNamespace           :  false,
+            XPathNSResolver          :  false,
+            XPathResult              :  false
+        },
+
+        couch = {
+            "require" : false,
+            respond   : false,
+            getRow    : false,
+            emit      : false,
+            send      : false,
+            start     : false,
+            sum       : false,
+            log       : false,
+            exports   : false,
+            module    : false,
+            provides  : false
+        },
+
+        devel = {
+            alert   : false,
+            confirm : false,
+            console : false,
+            Debug   : false,
+            opera   : false,
+            prompt  : false
+        },
+
+        dojo = {
+            dojo      : false,
+            dijit     : false,
+            dojox     : false,
+            define    : false,
+            "require" : false
+        },
+
+        escapes = {
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '/' : '\\/',
+            '\\': '\\\\'
+        },
+
+        funct,          // The current function
+
+        functionicity = [
+            'closure', 'exception', 'global', 'label',
+            'outer', 'unused', 'var'
+        ],
+
+        functions,      // All of the functions
+
+        global,         // The global scope
+        implied,        // Implied globals
+        inblock,
+        indent,
+        jsonmode,
+
+        jquery = {
+            '$'    : false,
+            jQuery : false
+        },
+
+        lines,
+        lookahead,
+        member,
+        membersOnly,
+
+        mootools = {
+            '$'             : false,
+            '$$'            : false,
+            Assets          : false,
+            Browser         : false,
+            Chain           : false,
+            Class           : false,
+            Color           : false,
+            Cookie          : false,
+            Core            : false,
+            Document        : false,
+            DomReady        : false,
+            DOMReady        : false,
+            Drag            : false,
+            Element         : false,
+            Elements        : false,
+            Event           : false,
+            Events          : false,
+            Fx              : false,
+            Group           : false,
+            Hash            : false,
+            HtmlTable       : false,
+            Iframe          : false,
+            IframeShim      : false,
+            InputValidator  : false,
+            instanceOf      : false,
+            Keyboard        : false,
+            Locale          : false,
+            Mask            : false,
+            MooTools        : false,
+            Native          : false,
+            Options         : false,
+            OverText        : false,
+            Request         : false,
+            Scroller        : false,
+            Slick           : false,
+            Slider          : false,
+            Sortables       : false,
+            Spinner         : false,
+            Swiff           : false,
+            Tips            : false,
+            Type            : false,
+            typeOf          : false,
+            URI             : false,
+            Window          : false
+        },
+
+        nexttoken,
+
+        node = {
+            __filename    : false,
+            __dirname     : false,
+            Buffer        : false,
+            console       : false,
+            exports       : false,
+            GLOBAL        : false,
+            global        : false,
+            module        : false,
+            process       : false,
+            require       : false,
+            setTimeout    : false,
+            clearTimeout  : false,
+            setInterval   : false,
+            clearInterval : false
+        },
+
+        noreach,
+        option,
+        predefined,     // Global variables defined by option
+        prereg,
+        prevtoken,
+
+        prototypejs = {
+            '$'               : false,
+            '$$'              : false,
+            '$A'              : false,
+            '$F'              : false,
+            '$H'              : false,
+            '$R'              : false,
+            '$break'          : false,
+            '$continue'       : false,
+            '$w'              : false,
+            Abstract          : false,
+            Ajax              : false,
+            Class             : false,
+            Enumerable        : false,
+            Element           : false,
+            Event             : false,
+            Field             : false,
+            Form              : false,
+            Hash              : false,
+            Insertion         : false,
+            ObjectRange       : false,
+            PeriodicalExecuter: false,
+            Position          : false,
+            Prototype         : false,
+            Selector          : false,
+            Template          : false,
+            Toggle            : false,
+            Try               : false,
+            Autocompleter     : false,
+            Builder           : false,
+            Control           : false,
+            Draggable         : false,
+            Draggables        : false,
+            Droppables        : false,
+            Effect            : false,
+            Sortable          : false,
+            SortableObserver  : false,
+            Sound             : false,
+            Scriptaculous     : false
+        },
+
+        rhino = {
+            defineClass  : false,
+            deserialize  : false,
+            gc           : false,
+            help         : false,
+            importPackage: false,
+            "java"       : false,
+            load         : false,
+            loadClass    : false,
+            print        : false,
+            quit         : false,
+            readFile     : false,
+            readUrl      : false,
+            runCommand   : false,
+            seal         : false,
+            serialize    : false,
+            spawn        : false,
+            sync         : false,
+            toint32      : false,
+            version      : false
+        },
+
+        scope,      // The current scope
+        stack,
+
+        // standard contains the global names that are provided by the
+        // ECMAScript standard.
+        standard = {
+            Array               : false,
+            Boolean             : false,
+            Date                : false,
+            decodeURI           : false,
+            decodeURIComponent  : false,
+            encodeURI           : false,
+            encodeURIComponent  : false,
+            Error               : false,
+            'eval'              : false,
+            EvalError           : false,
+            Function            : false,
+            hasOwnProperty      : false,
+            isFinite            : false,
+            isNaN               : false,
+            JSON                : false,
+            Math                : false,
+            Number              : false,
+            Object              : false,
+            parseInt            : false,
+            parseFloat          : false,
+            RangeError          : false,
+            ReferenceError      : false,
+            RegExp              : false,
+            String              : false,
+            SyntaxError         : false,
+            TypeError           : false,
+            URIError            : false
+        },
+
+        // widely adopted global names that are not part of ECMAScript standard
+        nonstandard = {
+            escape              : false,
+            unescape            : false
+        },
+
+        standard_member = {
+            E                   : true,
+            LN2                 : true,
+            LN10                : true,
+            LOG2E               : true,
+            LOG10E              : true,
+            MAX_VALUE           : true,
+            MIN_VALUE           : true,
+            NEGATIVE_INFINITY   : true,
+            PI                  : true,
+            POSITIVE_INFINITY   : true,
+            SQRT1_2             : true,
+            SQRT2               : true
+        },
+
+        directive,
+        syntax = {},
+        tab,
+        token,
+        urls,
+        useESNextSyntax,
+        warnings,
+
+        wsh = {
+            ActiveXObject             : true,
+            Enumerator                : true,
+            GetObject                 : true,
+            ScriptEngine              : true,
+            ScriptEngineBuildVersion  : true,
+            ScriptEngineMajorVersion  : true,
+            ScriptEngineMinorVersion  : true,
+            VBArray                   : true,
+            WSH                       : true,
+            WScript                   : true,
+            XDomainRequest            : true
+        };
+
+    // Regular expressions. Some of these are stupidly long.
+    var ax, cx, tx, nx, nxg, lx, ix, jx, ft;
+    (function () {
+        /*jshint maxlen:300 */
+
+        // unsafe comment or string
+        ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i;
+
+        // unsafe characters that are silently deleted by one or more browsers
+        cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
+
+        // token
+        tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jshint|jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/;
+
+        // characters in strings that need escapement
+        nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
+        nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+
+        // star slash
+        lx = /\*\/|\/\*/;
+
+        // identifier
+        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/;
+
+        // javascript url
+        jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i;
+
+        // catches /* falls through */ comments
+        ft = /^\s*\/\*\s*falls\sthrough\s*\*\/\s*$/;
+    }());
+
+    function F() {}     // Used by Object.create
+
+    function is_own(object, name) {
+
+// The object.hasOwnProperty method fails when the property under consideration
+// is named 'hasOwnProperty'. So we have to use this more convoluted form.
+
+        return Object.prototype.hasOwnProperty.call(object, name);
+    }
+
+// Provide critical ES5 functions to ES3.
+
+    if (typeof Array.isArray !== 'function') {
+        Array.isArray = function (o) {
+            return Object.prototype.toString.apply(o) === '[object Array]';
+        };
+    }
+
+    if (typeof Object.create !== 'function') {
+        Object.create = function (o) {
+            F.prototype = o;
+            return new F();
+        };
+    }
+
+    if (typeof Object.keys !== 'function') {
+        Object.keys = function (o) {
+            var a = [], k;
+            for (k in o) {
+                if (is_own(o, k)) {
+                    a.push(k);
+                }
+            }
+            return a;
+        };
+    }
+
+// Non standard methods
+
+    if (typeof String.prototype.entityify !== 'function') {
+        String.prototype.entityify = function () {
+            return this
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;');
+        };
+    }
+
+    if (typeof String.prototype.isAlpha !== 'function') {
+        String.prototype.isAlpha = function () {
+            return (this >= 'a' && this <= 'z\uffff') ||
+                (this >= 'A' && this <= 'Z\uffff');
+        };
+    }
+
+    if (typeof String.prototype.isDigit !== 'function') {
+        String.prototype.isDigit = function () {
+            return (this >= '0' && this <= '9');
+        };
+    }
+
+    if (typeof String.prototype.supplant !== 'function') {
+        String.prototype.supplant = function (o) {
+            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
+                var r = o[b];
+                return typeof r === 'string' || typeof r === 'number' ? r : a;
+            });
+        };
+    }
+
+    if (typeof String.prototype.name !== 'function') {
+        String.prototype.name = function () {
+
+// If the string looks like an identifier, then we can return it as is.
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can simply slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe
+// sequences.
+
+            if (ix.test(this)) {
+                return this;
+            }
+            if (nx.test(this)) {
+                return '"' + this.replace(nxg, function (a) {
+                    var c = escapes[a];
+                    if (c) {
+                        return c;
+                    }
+                    return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
+                }) + '"';
+            }
+            return '"' + this + '"';
+        };
+    }
+
+
+    function combine(t, o) {
+        var n;
+        for (n in o) {
+            if (is_own(o, n)) {
+                t[n] = o[n];
+            }
+        }
+    }
+
+    function assume() {
+        if (option.couch) {
+            combine(predefined, couch);
+        }
+
+        if (option.rhino) {
+            combine(predefined, rhino);
+        }
+
+        if (option.prototypejs) {
+            combine(predefined, prototypejs);
+        }
+
+        if (option.node) {
+            combine(predefined, node);
+        }
+
+        if (option.devel) {
+            combine(predefined, devel);
+        }
+
+        if (option.dojo) {
+            combine(predefined, dojo);
+        }
+
+        if (option.browser) {
+            combine(predefined, browser);
+        }
+
+        if (option.nonstandard) {
+            combine(predefined, nonstandard);
+        }
+
+        if (option.jquery) {
+            combine(predefined, jquery);
+        }
+
+        if (option.mootools) {
+            combine(predefined, mootools);
+        }
+
+        if (option.wsh) {
+            combine(predefined, wsh);
+        }
+
+        if (option.esnext) {
+            useESNextSyntax();
+        }
+
+        if (option.globalstrict && option.strict !== false) {
+            option.strict = true;
+        }
+    }
+
+
+    // Produce an error warning.
+    function quit(message, line, chr) {
+        var percentage = Math.floor((line / lines.length) * 100);
+
+        throw {
+            name: 'JSHintError',
+            line: line,
+            character: chr,
+            message: message + " (" + percentage + "% scanned).",
+            raw: message
+        };
+    }
+
+    function isundef(scope, m, t, a) {
+        return JSHINT.undefs.push([scope, m, t, a]);
+    }
+
+    function warning(m, t, a, b, c, d) {
+        var ch, l, w;
+        t = t || nexttoken;
+        if (t.id === '(end)') {  // `~
+            t = token;
+        }
+        l = t.line || 0;
+        ch = t.from || 0;
+        w = {
+            id: '(error)',
+            raw: m,
+            evidence: lines[l - 1] || '',
+            line: l,
+            character: ch,
+            a: a,
+            b: b,
+            c: c,
+            d: d
+        };
+        w.reason = m.supplant(w);
+        JSHINT.errors.push(w);
+        if (option.passfail) {
+            quit('Stopping. ', l, ch);
+        }
+        warnings += 1;
+        if (warnings >= option.maxerr) {
+            quit("Too many errors.", l, ch);
+        }
+        return w;
+    }
+
+    function warningAt(m, l, ch, a, b, c, d) {
+        return warning(m, {
+            line: l,
+            from: ch
+        }, a, b, c, d);
+    }
+
+    function error(m, t, a, b, c, d) {
+        var w = warning(m, t, a, b, c, d);
+    }
+
+    function errorAt(m, l, ch, a, b, c, d) {
+        return error(m, {
+            line: l,
+            from: ch
+        }, a, b, c, d);
+    }
+
+
+
+// lexical analysis and token construction
+
+    var lex = (function lex() {
+        var character, from, line, s;
+
+// Private lex methods
+
+        function nextLine() {
+            var at,
+                tw; // trailing whitespace check
+
+            if (line >= lines.length)
+                return false;
+
+            character = 1;
+            s = lines[line];
+            line += 1;
+
+            // If smarttabs option is used check for spaces followed by tabs only.
+            // Otherwise check for any occurence of mixed tabs and spaces.
+            if (option.smarttabs)
+                at = s.search(/ \t/);
+            else
+                at = s.search(/ \t|\t /);
+
+            if (at >= 0)
+                warningAt("Mixed spaces and tabs.", line, at + 1);
+
+            s = s.replace(/\t/g, tab);
+            at = s.search(cx);
+
+            if (at >= 0)
+                warningAt("Unsafe character.", line, at);
+
+            if (option.maxlen && option.maxlen < s.length)
+                warningAt("Line too long.", line, s.length);
+
+            // Check for trailing whitespaces
+            tw = /\s+$/.test(s);
+            if (option.trailing && tw && !/^\s+$/.test(s)) {
+                warningAt("Trailing whitespace.", line, tw);
+            }
+            return true;
+        }
+
+// Produce a token object.  The token inherits from a syntax symbol.
+
+        function it(type, value) {
+            var i, t;
+            if (type === '(color)' || type === '(range)') {
+                t = {type: type};
+            } else if (type === '(punctuator)' ||
+                    (type === '(identifier)' && is_own(syntax, value))) {
+                t = syntax[value] || syntax['(error)'];
+            } else {
+                t = syntax[type];
+            }
+            t = Object.create(t);
+            if (type === '(string)' || type === '(range)') {
+                if (!option.scripturl && jx.test(value)) {
+                    warningAt("Script URL.", line, from);
+                }
+            }
+            if (type === '(identifier)') {
+                t.identifier = true;
+                if (value === '__proto__' && !option.proto) {
+                    warningAt("The '{a}' property is deprecated.",
+                        line, from, value);
+                } else if (value === '__iterator__' && !option.iterator) {
+                    warningAt("'{a}' is only available in JavaScript 1.7.",
+                        line, from, value);
+                } else if (option.nomen && (value.charAt(0) === '_' ||
+                         value.charAt(value.length - 1) === '_')) {
+                    if (!option.node || token.id === '.' ||
+                            (value !== '__dirname' && value !== '__filename')) {
+                        warningAt("Unexpected {a} in '{b}'.", line, from, "dangling '_'", value);
+                    }
+                }
+            }
+            t.value = value;
+            t.line = line;
+            t.character = character;
+            t.from = from;
+            i = t.id;
+            if (i !== '(endline)') {
+                prereg = i &&
+                    (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
+                    i === 'return' ||
+                    i === 'case');
+            }
+            return t;
+        }
+
+        // Public lex methods
+        return {
+            init: function (source) {
+                if (typeof source === 'string') {
+                    lines = source
+                        .replace(/\r\n/g, '\n')
+                        .replace(/\r/g, '\n')
+                        .split('\n');
+                } else {
+                    lines = source;
+                }
+
+                // If the first line is a shebang (#!), make it a blank and move on.
+                // Shebangs are used by Node scripts.
+                if (lines[0] && lines[0].substr(0, 2) === '#!')
+                    lines[0] = '';
+
+                line = 0;
+                nextLine();
+                from = 1;
+            },
+
+            range: function (begin, end) {
+                var c, value = '';
+                from = character;
+                if (s.charAt(0) !== begin) {
+                    errorAt("Expected '{a}' and instead saw '{b}'.",
+                            line, character, begin, s.charAt(0));
+                }
+                for (;;) {
+                    s = s.slice(1);
+                    character += 1;
+                    c = s.charAt(0);
+                    switch (c) {
+                    case '':
+                        errorAt("Missing '{a}'.", line, character, c);
+                        break;
+                    case end:
+                        s = s.slice(1);
+                        character += 1;
+                        return it('(range)', value);
+                    case '\\':
+                        warningAt("Unexpected '{a}'.", line, character, c);
+                    }
+                    value += c;
+                }
+
+            },
+
+
+            // token -- this is called by advance to get the next token
+            token: function () {
+                var b, c, captures, d, depth, high, i, l, low, q, t, isLiteral, isInRange;
+
+                function match(x) {
+                    var r = x.exec(s), r1;
+                    if (r) {
+                        l = r[0].length;
+                        r1 = r[1];
+                        c = r1.charAt(0);
+                        s = s.substr(l);
+                        from = character + l - r1.length;
+                        character += l;
+                        return r1;
+                    }
+                }
+
+                function string(x) {
+                    var c, j, r = '', allowNewLine = false;
+
+                    if (jsonmode && x !== '"') {
+                        warningAt("Strings must use doublequote.",
+                                line, character);
+                    }
+
+                    function esc(n) {
+                        var i = parseInt(s.substr(j + 1, n), 16);
+                        j += n;
+                        if (i >= 32 && i <= 126 &&
+                                i !== 34 && i !== 92 && i !== 39) {
+                            warningAt("Unnecessary escapement.", line, character);
+                        }
+                        character += n;
+                        c = String.fromCharCode(i);
+                    }
+                    j = 0;
+unclosedString:     for (;;) {
+                        while (j >= s.length) {
+                            j = 0;
+
+                            var cl = line, cf = from;
+                            if (!nextLine()) {
+                                errorAt("Unclosed string.", cl, cf);
+                                break unclosedString;
+                            }
+
+                            if (allowNewLine) {
+                                allowNewLine = false;
+                            } else {
+                                warningAt("Unclosed string.", cl, cf);
+                            }
+                        }
+                        c = s.charAt(j);
+                        if (c === x) {
+                            character += 1;
+                            s = s.substr(j + 1);
+                            return it('(string)', r, x);
+                        }
+                        if (c < ' ') {
+                            if (c === '\n' || c === '\r') {
+                                break;
+                            }
+                            warningAt("Control character in string: {a}.",
+                                    line, character + j, s.slice(0, j));
+                        } else if (c === '\\') {
+                            j += 1;
+                            character += 1;
+                            c = s.charAt(j);
+                            switch (c) {
+                            case '\\':
+                            case '"':
+                            case '/':
+                                break;
+                            case '\'':
+                                if (jsonmode) {
+                                    warningAt("Avoid \\'.", line, character);
+                                }
+                                break;
+                            case 'b':
+                                c = '\b';
+                                break;
+                            case 'f':
+                                c = '\f';
+                                break;
+                            case 'n':
+                                c = '\n';
+                                break;
+                            case 'r':
+                                c = '\r';
+                                break;
+                            case 't':
+                                c = '\t';
+                                break;
+                            case 'u':
+                                esc(4);
+                                break;
+                            case 'v':
+                                if (jsonmode) {
+                                    warningAt("Avoid \\v.", line, character);
+                                }
+                                c = '\v';
+                                break;
+                            case 'x':
+                                if (jsonmode) {
+                                    warningAt("Avoid \\x-.", line, character);
+                                }
+                                esc(2);
+                                break;
+                            case '':
+                                // last character is escape character
+                                // always allow new line if escaped, but show
+                                // warning if option is not set
+                                allowNewLine = true;
+                                if (option.multistr) {
+                                    if (jsonmode) {
+                                        warningAt("Avoid EOL escapement.", line, character);
+                                    }
+                                    c = '';
+                                    character -= 1;
+                                    break;
+                                }
+                                warningAt("Bad escapement of EOL. Use option multistr if needed.",
+                                    line, character);
+                                break;
+                            default:
+                                warningAt("Bad escapement.", line, character);
+                            }
+                        }
+                        r += c;
+                        character += 1;
+                        j += 1;
+                    }
+                }
+
+                for (;;) {
+                    if (!s) {
+                        return it(nextLine() ? '(endline)' : '(end)', '');
+                    }
+                    t = match(tx);
+                    if (!t) {
+                        t = '';
+                        c = '';
+                        while (s && s < '!') {
+                            s = s.substr(1);
+                        }
+                        if (s) {
+                            errorAt("Unexpected '{a}'.", line, character, s.substr(0, 1));
+                            s = '';
+                        }
+                    } else {
+
+    //      identifier
+
+                        if (c.isAlpha() || c === '_' || c === '$') {
+                            return it('(identifier)', t);
+                        }
+
+    //      number
+
+                        if (c.isDigit()) {
+                            if (!isFinite(Number(t))) {
+                                warningAt("Bad number '{a}'.",
+                                    line, character, t);
+                            }
+                            if (s.substr(0, 1).isAlpha()) {
+                                warningAt("Missing space after '{a}'.",
+                                        line, character, t);
+                            }
+                            if (c === '0') {
+                                d = t.substr(1, 1);
+                                if (d.isDigit()) {
+                                    if (token.id !== '.') {
+                                        warningAt("Don't use extra leading zeros '{a}'.",
+                                            line, character, t);
+                                    }
+                                } else if (jsonmode && (d === 'x' || d === 'X')) {
+                                    warningAt("Avoid 0x-. '{a}'.",
+                                            line, character, t);
+                                }
+                            }
+                            if (t.substr(t.length - 1) === '.') {
+                                warningAt(
+"A trailing decimal point can be confused with a dot '{a}'.", line, character, t);
+                            }
+                            return it('(number)', t);
+                        }
+                        switch (t) {
+
+    //      string
+
+                        case '"':
+                        case "'":
+                            return string(t);
+
+    //      // comment
+
+                        case '//':
+                            s = '';
+                            token.comment = true;
+                            break;
+
+    //      /* comment
+
+                        case '/*':
+                            for (;;) {
+                                i = s.search(lx);
+                                if (i >= 0) {
+                                    break;
+                                }
+                                if (!nextLine()) {
+                                    errorAt("Unclosed comment.", line, character);
+                                }
+                            }
+                            character += i + 2;
+                            if (s.substr(i, 1) === '/') {
+                                errorAt("Nested comment.", line, character);
+                            }
+                            s = s.substr(i + 2);
+                            token.comment = true;
+                            break;
+
+    //      /*members /*jshint /*global
+
+                        case '/*members':
+                        case '/*member':
+                        case '/*jshint':
+                        case '/*jslint':
+                        case '/*global':
+                        case '*/':
+                            return {
+                                value: t,
+                                type: 'special',
+                                line: line,
+                                character: character,
+                                from: from
+                            };
+
+                        case '':
+                            break;
+    //      /
+                        case '/':
+                            if (token.id === '/=') {
+                                errorAt("A regular expression literal can be confused with '/='.",
+                                    line, from);
+                            }
+                            if (prereg) {
+                                depth = 0;
+                                captures = 0;
+                                l = 0;
+                                for (;;) {
+                                    b = true;
+                                    c = s.charAt(l);
+                                    l += 1;
+                                    switch (c) {
+                                    case '':
+                                        errorAt("Unclosed regular expression.", line, from);
+                                        return quit('Stopping.', line, from);
+                                    case '/':
+                                        if (depth > 0) {
+                                            warningAt("{a} unterminated regular expression " +
+                                                "group(s).", line, from + l, depth);
+                                        }
+                                        c = s.substr(0, l - 1);
+                                        q = {
+                                            g: true,
+                                            i: true,
+                                            m: true
+                                        };
+                                        while (q[s.charAt(l)] === true) {
+                                            q[s.charAt(l)] = false;
+                                            l += 1;
+                                        }
+                                        character += l;
+                                        s = s.substr(l);
+                                        q = s.charAt(0);
+                                        if (q === '/' || q === '*') {
+                                            errorAt("Confusing regular expression.",
+                                                    line, from);
+                                        }
+                                        return it('(regexp)', c);
+                                    case '\\':
+                                        c = s.charAt(l);
+                                        if (c < ' ') {
+                                            warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+                                        } else if (c === '<') {
+                                            warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+                                        }
+                                        l += 1;
+                                        break;
+                                    case '(':
+                                        depth += 1;
+                                        b = false;
+                                        if (s.charAt(l) === '?') {
+                                            l += 1;
+                                            switch (s.charAt(l)) {
+                                            case ':':
+                                            case '=':
+                                            case '!':
+                                                l += 1;
+                                                break;
+                                            default:
+                                                warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
+                                            }
+                                        } else {
+                                            captures += 1;
+                                        }
+                                        break;
+                                    case '|':
+                                        b = false;
+                                        break;
+                                    case ')':
+                                        if (depth === 0) {
+                                            warningAt("Unescaped '{a}'.",
+                                                    line, from + l, ')');
+                                        } else {
+                                            depth -= 1;
+                                        }
+                                        break;
+                                    case ' ':
+                                        q = 1;
+                                        while (s.charAt(l) === ' ') {
+                                            l += 1;
+                                            q += 1;
+                                        }
+                                        if (q > 1) {
+                                            warningAt(
+"Spaces are hard to count. Use {{a}}.", line, from + l, q);
+                                        }
+                                        break;
+                                    case '[':
+                                        c = s.charAt(l);
+                                        if (c === '^') {
+                                            l += 1;
+                                            if (option.regexp) {
+                                                warningAt("Insecure '{a}'.",
+                                                        line, from + l, c);
+                                            } else if (s.charAt(l) === ']') {
+                                                errorAt("Unescaped '{a}'.",
+                                                    line, from + l, '^');
+                                            }
+                                        }
+                                        if (c === ']') {
+                                            warningAt("Empty class.", line,
+                                                    from + l - 1);
+                                        }
+                                        isLiteral = false;
+                                        isInRange = false;
+klass:                                  do {
+                                            c = s.charAt(l);
+                                            l += 1;
+                                            switch (c) {
+                                            case '[':
+                                            case '^':
+                                                warningAt("Unescaped '{a}'.",
+                                                        line, from + l, c);
+                                                if (isInRange) {
+                                                    isInRange = false;
+                                                } else {
+                                                    isLiteral = true;
+                                                }
+                                                break;
+                                            case '-':
+                                                if (isLiteral && !isInRange) {
+                                                    isLiteral = false;
+                                                    isInRange = true;
+                                                } else if (isInRange) {
+                                                    isInRange = false;
+                                                } else if (s.charAt(l) === ']') {
+                                                    isInRange = true;
+                                                } else {
+                                                    if (option.regexdash !== (l === 2 || (l === 3 &&
+                                                        s.charAt(1) === '^'))) {
+                                                        warningAt("Unescaped '{a}'.",
+                                                            line, from + l - 1, '-');
+                                                    }
+                                                    isLiteral = true;
+                                                }
+                                                break;
+                                            case ']':
+                                                if (isInRange && !option.regexdash) {
+                                                    warningAt("Unescaped '{a}'.",
+                                                            line, from + l - 1, '-');
+                                                }
+                                                break klass;
+                                            case '\\':
+                                                c = s.charAt(l);
+                                                if (c < ' ') {
+                                                    warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+                                                } else if (c === '<') {
+                                                    warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+                                                }
+                                                l += 1;
+
+                                                // \w, \s and \d are never part of a character range
+                                                if (/[wsd]/i.test(c)) {
+                                                    if (isInRange) {
+                                                        warningAt("Unescaped '{a}'.",
+                                                            line, from + l, '-');
+                                                        isInRange = false;
+                                                    }
+                                                    isLiteral = false;
+                                                } else if (isInRange) {
+                                                    isInRange = false;
+                                                } else {
+                                                    isLiteral = true;
+                                                }
+                                                break;
+                                            case '/':
+                                                warningAt("Unescaped '{a}'.",
+                                                        line, from + l - 1, '/');
+
+                                                if (isInRange) {
+                                                    isInRange = false;
+                                                } else {
+                                                    isLiteral = true;
+                                                }
+                                                break;
+                                            case '<':
+                                                if (isInRange) {
+                                                    isInRange = false;
+                                                } else {
+                                                    isLiteral = true;
+                                                }
+                                                break;
+                                            default:
+                                                if (isInRange) {
+                                                    isInRange = false;
+                                                } else {
+                                                    isLiteral = true;
+                                                }
+                                            }
+                                        } while (c);
+                                        break;
+                                    case '.':
+                                        if (option.regexp) {
+                                            warningAt("Insecure '{a}'.", line,
+                                                    from + l, c);
+                                        }
+                                        break;
+                                    case ']':
+                                    case '?':
+                                    case '{':
+                                    case '}':
+                                    case '+':
+                                    case '*':
+                                        warningAt("Unescaped '{a}'.", line,
+                                                from + l, c);
+                                    }
+                                    if (b) {
+                                        switch (s.charAt(l)) {
+                                        case '?':
+                                        case '+':
+                                        case '*':
+                                            l += 1;
+                                            if (s.charAt(l) === '?') {
+                                                l += 1;
+                                            }
+                                            break;
+                                        case '{':
+                                            l += 1;
+                                            c = s.charAt(l);
+                                            if (c < '0' || c > '9') {
+                                                warningAt(
+"Expected a number and instead saw '{a}'.", line, from + l, c);
+                                            }
+                                            l += 1;
+                                            low = +c;
+                                            for (;;) {
+                                                c = s.charAt(l);
+                                                if (c < '0' || c > '9') {
+                                                    break;
+                                                }
+                                                l += 1;
+                                                low = +c + (low * 10);
+                                            }
+                                            high = low;
+                                            if (c === ',') {
+                                                l += 1;
+                                                high = Infinity;
+                                                c = s.charAt(l);
+                                                if (c >= '0' && c <= '9') {
+                                                    l += 1;
+                                                    high = +c;
+                                                    for (;;) {
+                                                        c = s.charAt(l);
+                                                        if (c < '0' || c > '9') {
+                                                            break;
+                                                        }
+                                                        l += 1;
+                                                        high = +c + (high * 10);
+                                                    }
+                                                }
+                                            }
+                                            if (s.charAt(l) !== '}') {
+                                                warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
+                                            } else {
+                                                l += 1;
+                                            }
+                                            if (s.charAt(l) === '?') {
+                                                l += 1;
+                                            }
+                                            if (low > high) {
+                                                warningAt(
+"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
+                                            }
+                                        }
+                                    }
+                                }
+                                c = s.substr(0, l - 1);
+                                character += l;
+                                s = s.substr(l);
+                                return it('(regexp)', c);
+                            }
+                            return it('(punctuator)', t);
+
+    //      punctuator
+
+                        case '#':
+                            return it('(punctuator)', t);
+                        default:
+                            return it('(punctuator)', t);
+                        }
+                    }
+                }
+            }
+        };
+    }());
+
+
+    function addlabel(t, type) {
+
+        if (t === 'hasOwnProperty') {
+            warning("'hasOwnProperty' is a really bad name.");
+        }
+
+// Define t in the current function in the current scope.
+        if (is_own(funct, t) && !funct['(global)']) {
+            if (funct[t] === true) {
+                if (option.latedef)
+                    warning("'{a}' was used before it was defined.", nexttoken, t);
+            } else {
+                if (!option.shadow && type !== "exception")
+                    warning("'{a}' is already defined.", nexttoken, t);
+            }
+        }
+
+        funct[t] = type;
+        if (funct['(global)']) {
+            global[t] = funct;
+            if (is_own(implied, t)) {
+                if (option.latedef)
+                    warning("'{a}' was used before it was defined.", nexttoken, t);
+                delete implied[t];
+            }
+        } else {
+            scope[t] = funct;
+        }
+    }
+
+
+    function doOption() {
+        var b, obj, filter, o = nexttoken.value, t, v;
+        switch (o) {
+        case '*/':
+            error("Unbegun comment.");
+            break;
+        case '/*members':
+        case '/*member':
+            o = '/*members';
+            if (!membersOnly) {
+                membersOnly = {};
+            }
+            obj = membersOnly;
+            break;
+        case '/*jshint':
+        case '/*jslint':
+            obj = option;
+            filter = boolOptions;
+            break;
+        case '/*global':
+            obj = predefined;
+            break;
+        default:
+            error("What?");
+        }
+        t = lex.token();
+loop:   for (;;) {
+            for (;;) {
+                if (t.type === 'special' && t.value === '*/') {
+                    break loop;
+                }
+                if (t.id !== '(endline)' && t.id !== ',') {
+                    break;
+                }
+                t = lex.token();
+            }
+            if (t.type !== '(string)' && t.type !== '(identifier)' &&
+                    o !== '/*members') {
+                error("Bad option.", t);
+            }
+            v = lex.token();
+            if (v.id === ':') {
+                v = lex.token();
+                if (obj === membersOnly) {
+                    error("Expected '{a}' and instead saw '{b}'.",
+                            t, '*/', ':');
+                }
+                if (t.value === 'indent' && (o === '/*jshint' || o === '/*jslint')) {
+                    b = +v.value;
+                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+                            Math.floor(b) !== b) {
+                        error("Expected a small integer and instead saw '{a}'.",
+                                v, v.value);
+                    }
+                    obj.white = true;
+                    obj.indent = b;
+                } else if (t.value === 'maxerr' && (o === '/*jshint' || o === '/*jslint')) {
+                    b = +v.value;
+                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+                            Math.floor(b) !== b) {
+                        error("Expected a small integer and instead saw '{a}'.",
+                                v, v.value);
+                    }
+                    obj.maxerr = b;
+                } else if (t.value === 'maxlen' && (o === '/*jshint' || o === '/*jslint')) {
+                    b = +v.value;
+                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+                            Math.floor(b) !== b) {
+                        error("Expected a small integer and instead saw '{a}'.",
+                                v, v.value);
+                    }
+                    obj.maxlen = b;
+                } else if (t.value === 'validthis') {
+                    if (funct['(global)']) {
+                        error("Option 'validthis' can't be used in a global scope.");
+                    } else {
+                        if (v.value === 'true' || v.value === 'false')
+                            obj[t.value] = v.value === 'true';
+                        else
+                            error("Bad option value.", v);
+                    }
+                } else if (v.value === 'true') {
+                    obj[t.value] = true;
+                } else if (v.value === 'false') {
+                    obj[t.value] = false;
+                } else {
+                    error("Bad option value.", v);
+                }
+                t = lex.token();
+            } else {
+                if (o === '/*jshint' || o === '/*jslint') {
+                    error("Missing option value.", t);
+                }
+                obj[t.value] = false;
+                t = v;
+            }
+        }
+        if (filter) {
+            assume();
+        }
+    }
+
+
+// We need a peek function. If it has an argument, it peeks that much farther
+// ahead. It is used to distinguish
+//     for ( var i in ...
+// from
+//     for ( var i = ...
+
+    function peek(p) {
+        var i = p || 0, j = 0, t;
+
+        while (j <= i) {
+            t = lookahead[j];
+            if (!t) {
+                t = lookahead[j] = lex.token();
+            }
+            j += 1;
+        }
+        return t;
+    }
+
+
+
+// Produce the next token. It looks for programming errors.
+
+    function advance(id, t) {
+        switch (token.id) {
+        case '(number)':
+            if (nexttoken.id === '.') {
+                warning("A dot following a number can be confused with a decimal point.", token);
+            }
+            break;
+        case '-':
+            if (nexttoken.id === '-' || nexttoken.id === '--') {
+                warning("Confusing minusses.");
+            }
+            break;
+        case '+':
+            if (nexttoken.id === '+' || nexttoken.id === '++') {
+                warning("Confusing plusses.");
+            }
+            break;
+        }
+
+        if (token.type === '(string)' || token.identifier) {
+            anonname = token.value;
+        }
+
+        if (id && nexttoken.id !== id) {
+            if (t) {
+                if (nexttoken.id === '(end)') {
+                    warning("Unmatched '{a}'.", t, t.id);
+                } else {
+                    warning("Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
+                            nexttoken, id, t.id, t.line, nexttoken.value);
+                }
+            } else if (nexttoken.type !== '(identifier)' ||
+                            nexttoken.value !== id) {
+                warning("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, id, nexttoken.value);
+            }
+        }
+
+        prevtoken = token;
+        token = nexttoken;
+        for (;;) {
+            nexttoken = lookahead.shift() || lex.token();
+            if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
+                return;
+            }
+            if (nexttoken.type === 'special') {
+                doOption();
+            } else {
+                if (nexttoken.id !== '(endline)') {
+                    break;
+                }
+            }
+        }
+    }
+
+
+// This is the heart of JSHINT, the Pratt parser. In addition to parsing, it
+// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
+// like .nud except that it is only used on the first token of a statement.
+// Having .fud makes it much easier to define statement-oriented languages like
+// JavaScript. I retained Pratt's nomenclature.
+
+// .nud     Null denotation
+// .fud     First null denotation
+// .led     Left denotation
+//  lbp     Left binding power
+//  rbp     Right binding power
+
+// They are elements of the parsing method called Top Down Operator Precedence.
+
+    function expression(rbp, initial) {
+        var left, isArray = false;
+
+        if (nexttoken.id === '(end)')
+            error("Unexpected early end of program.", token);
+
+        advance();
+        if (initial) {
+            anonname = 'anonymous';
+            funct['(verb)'] = token.value;
+        }
+        if (initial === true && token.fud) {
+            left = token.fud();
+        } else {
+            if (token.nud) {
+                left = token.nud();
+            } else {
+                if (nexttoken.type === '(number)' && token.id === '.') {
+                    warning("A leading decimal point can be confused with a dot: '.{a}'.",
+                            token, nexttoken.value);
+                    advance();
+                    return token;
+                } else {
+                    error("Expected an identifier and instead saw '{a}'.",
+                            token, token.id);
+                }
+            }
+            while (rbp < nexttoken.lbp) {
+                isArray = token.value === 'Array';
+                advance();
+                if (isArray && token.id === '(' && nexttoken.id === ')')
+                    warning("Use the array literal notation [].", token);
+                if (token.led) {
+                    left = token.led(left);
+                } else {
+                    error("Expected an operator and instead saw '{a}'.",
+                        token, token.id);
+                }
+            }
+        }
+        return left;
+    }
+
+
+// Functions for conformance of style.
+
+    function adjacent(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (option.white) {
+            if (left.character !== right.from && left.line === right.line) {
+                left.from += (left.character - left.from);
+                warning("Unexpected space after '{a}'.", left, left.value);
+            }
+        }
+    }
+
+    function nobreak(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (option.white && (left.character !== right.from || left.line !== right.line)) {
+            warning("Unexpected space before '{a}'.", right, right.value);
+        }
+    }
+
+    function nospace(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (option.white && !left.comment) {
+            if (left.line === right.line) {
+                adjacent(left, right);
+            }
+        }
+    }
+
+    function nonadjacent(left, right) {
+        if (option.white) {
+            left = left || token;
+            right = right || nexttoken;
+            if (left.line === right.line && left.character === right.from) {
+                left.from += (left.character - left.from);
+                warning("Missing space after '{a}'.",
+                        left, left.value);
+            }
+        }
+    }
+
+    function nobreaknonadjacent(left, right) {
+        left = left || token;
+        right = right || nexttoken;
+        if (!option.laxbreak && left.line !== right.line) {
+            warning("Bad line breaking before '{a}'.", right, right.id);
+        } else if (option.white) {
+            left = left || token;
+            right = right || nexttoken;
+            if (left.character === right.from) {
+                left.from += (left.character - left.from);
+                warning("Missing space after '{a}'.",
+                        left, left.value);
+            }
+        }
+    }
+
+    function indentation(bias) {
+        var i;
+        if (option.white && nexttoken.id !== '(end)') {
+            i = indent + (bias || 0);
+            if (nexttoken.from !== i) {
+                warning(
+"Expected '{a}' to have an indentation at {b} instead at {c}.",
+                        nexttoken, nexttoken.value, i, nexttoken.from);
+            }
+        }
+    }
+
+    function nolinebreak(t) {
+        t = t || token;
+        if (t.line !== nexttoken.line) {
+            warning("Line breaking error '{a}'.", t, t.value);
+        }
+    }
+
+
+    function comma() {
+        if (token.line !== nexttoken.line) {
+            if (!option.laxcomma) {
+                if (comma.first) {
+                    warning("Comma warnings can be turned off with 'laxcomma'");
+                    comma.first = false;
+                }
+                warning("Bad line breaking before '{a}'.", token, nexttoken.id);
+            }
+        } else if (!token.comment && token.character !== nexttoken.from && option.white) {
+            token.from += (token.character - token.from);
+            warning("Unexpected space after '{a}'.", token, token.value);
+        }
+        advance(',');
+        nonadjacent(token, nexttoken);
+    }
+
+    comma.first = true;
+
+
+// Functional constructors for making the symbols that will be inherited by
+// tokens.
+
+    function symbol(s, p) {
+        var x = syntax[s];
+        if (!x || typeof x !== 'object') {
+            syntax[s] = x = {
+                id: s,
+                lbp: p,
+                value: s
+            };
+        }
+        return x;
+    }
+
+
+    function delim(s) {
+        return symbol(s, 0);
+    }
+
+
+    function stmt(s, f) {
+        var x = delim(s);
+        x.identifier = x.reserved = true;
+        x.fud = f;
+        return x;
+    }
+
+
+    function blockstmt(s, f) {
+        var x = stmt(s, f);
+        x.block = true;
+        return x;
+    }
+
+
+    function reserveName(x) {
+        var c = x.id.charAt(0);
+        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+            x.identifier = x.reserved = true;
+        }
+        return x;
+    }
+
+
+    function prefix(s, f) {
+        var x = symbol(s, 150);
+        reserveName(x);
+        x.nud = (typeof f === 'function') ? f : function () {
+            this.right = expression(150);
+            this.arity = 'unary';
+            if (this.id === '++' || this.id === '--') {
+                if (option.plusplus) {
+                    warning("Unexpected use of '{a}'.", this, this.id);
+                } else if ((!this.right.identifier || this.right.reserved) &&
+                        this.right.id !== '.' && this.right.id !== '[') {
+                    warning("Bad operand.", this);
+                }
+            }
+            return this;
+        };
+        return x;
+    }
+
+
+    function type(s, f) {
+        var x = delim(s);
+        x.type = s;
+        x.nud = f;
+        return x;
+    }
+
+
+    function reserve(s, f) {
+        var x = type(s, f);
+        x.identifier = x.reserved = true;
+        return x;
+    }
+
+
+    function reservevar(s, v) {
+        return reserve(s, function () {
+            if (typeof v === 'function') {
+                v(this);
+            }
+            return this;
+        });
+    }
+
+
+    function infix(s, f, p, w) {
+        var x = symbol(s, p);
+        reserveName(x);
+        x.led = function (left) {
+            if (!w) {
+                nobreaknonadjacent(prevtoken, token);
+                nonadjacent(token, nexttoken);
+            }
+            if (s === "in" && left.id === "!") {
+                warning("Confusing use of '{a}'.", left, '!');
+            }
+            if (typeof f === 'function') {
+                return f(left, this);
+            } else {
+                this.left = left;
+                this.right = expression(p);
+                return this;
+            }
+        };
+        return x;
+    }
+
+
+    function relation(s, f) {
+        var x = symbol(s, 100);
+        x.led = function (left) {
+            nobreaknonadjacent(prevtoken, token);
+            nonadjacent(token, nexttoken);
+            var right = expression(100);
+            if ((left && left.id === 'NaN') || (right && right.id === 'NaN')) {
+                warning("Use the isNaN function to compare with NaN.", this);
+            } else if (f) {
+                f.apply(this, [left, right]);
+            }
+            if (left.id === '!') {
+                warning("Confusing use of '{a}'.", left, '!');
+            }
+            if (right.id === '!') {
+                warning("Confusing use of '{a}'.", right, '!');
+            }
+            this.left = left;
+            this.right = right;
+            return this;
+        };
+        return x;
+    }
+
+
+    function isPoorRelation(node) {
+        return node &&
+              ((node.type === '(number)' && +node.value === 0) ||
+               (node.type === '(string)' && node.value === '') ||
+               (node.type === 'null' && !option.eqnull) ||
+                node.type === 'true' ||
+                node.type === 'false' ||
+                node.type === 'undefined');
+    }
+
+
+    function assignop(s, f) {
+        symbol(s, 20).exps = true;
+        return infix(s, function (left, that) {
+            var l;
+            that.left = left;
+            if (predefined[left.value] === false &&
+                    scope[left.value]['(global)'] === true) {
+                warning("Read only.", left);
+            } else if (left['function']) {
+                warning("'{a}' is a function.", left, left.value);
+            }
+            if (left) {
+                if (option.esnext && funct[left.value] === 'const') {
+                    warning("Attempting to override '{a}' which is a constant", left, left.value);
+                }
+                if (left.id === '.' || left.id === '[') {
+                    if (!left.left || left.left.value === 'arguments') {
+                        warning('Bad assignment.', that);
+                    }
+                    that.right = expression(19);
+                    return that;
+                } else if (left.identifier && !left.reserved) {
+                    if (funct[left.value] === 'exception') {
+                        warning("Do not assign to the exception parameter.", left);
+                    }
+                    that.right = expression(19);
+                    return that;
+                }
+                if (left === syntax['function']) {
+                    warning(
+"Expected an identifier in an assignment and instead saw a function invocation.",
+                                token);
+                }
+            }
+            error("Bad assignment.", that);
+        }, 20);
+    }
+
+
+    function bitwise(s, f, p) {
+        var x = symbol(s, p);
+        reserveName(x);
+        x.led = (typeof f === 'function') ? f : function (left) {
+            if (option.bitwise) {
+                warning("Unexpected use of '{a}'.", this, this.id);
+            }
+            this.left = left;
+            this.right = expression(p);
+            return this;
+        };
+        return x;
+    }
+
+
+    function bitwiseassignop(s) {
+        symbol(s, 20).exps = true;
+        return infix(s, function (left, that) {
+            if (option.bitwise) {
+                warning("Unexpected use of '{a}'.", that, that.id);
+            }
+            nonadjacent(prevtoken, token);
+            nonadjacent(token, nexttoken);
+            if (left) {
+                if (left.id === '.' || left.id === '[' ||
+                        (left.identifier && !left.reserved)) {
+                    expression(19);
+                    return that;
+                }
+                if (left === syntax['function']) {
+                    warning(
+"Expected an identifier in an assignment, and instead saw a function invocation.",
+                                token);
+                }
+                return that;
+            }
+            error("Bad assignment.", that);
+        }, 20);
+    }
+
+
+    function suffix(s, f) {
+        var x = symbol(s, 150);
+        x.led = function (left) {
+            if (option.plusplus) {
+                warning("Unexpected use of '{a}'.", this, this.id);
+            } else if ((!left.identifier || left.reserved) &&
+                    left.id !== '.' && left.id !== '[') {
+                warning("Bad operand.", this);
+            }
+            this.left = left;
+            return this;
+        };
+        return x;
+    }
+
+
+    // fnparam means that this identifier is being defined as a function
+    // argument (see identifier())
+    function optionalidentifier(fnparam) {
+        if (nexttoken.identifier) {
+            advance();
+            if (token.reserved && !option.es5) {
+                // `undefined` as a function param is a common pattern to protect
+                // against the case when somebody does `undefined = true` and
+                // help with minification. More info: https://gist.github.com/315916
+                if (!fnparam || token.value !== 'undefined') {
+                    warning("Expected an identifier and instead saw '{a}' (a reserved word).",
+                            token, token.id);
+                }
+            }
+            return token.value;
+        }
+    }
+
+    // fnparam means that this identifier is being defined as a function
+    // argument
+    function identifier(fnparam) {
+        var i = optionalidentifier(fnparam);
+        if (i) {
+            return i;
+        }
+        if (token.id === 'function' && nexttoken.id === '(') {
+            warning("Missing name in function declaration.");
+        } else {
+            error("Expected an identifier and instead saw '{a}'.",
+                    nexttoken, nexttoken.value);
+        }
+    }
+
+
+    function reachable(s) {
+        var i = 0, t;
+        if (nexttoken.id !== ';' || noreach) {
+            return;
+        }
+        for (;;) {
+            t = peek(i);
+            if (t.reach) {
+                return;
+            }
+            if (t.id !== '(endline)') {
+                if (t.id === 'function') {
+                    if (!option.latedef) {
+                        break;
+                    }
+                    warning(
+"Inner functions should be listed at the top of the outer function.", t);
+                    break;
+                }
+                warning("Unreachable '{a}' after '{b}'.", t, t.value, s);
+                break;
+            }
+            i += 1;
+        }
+    }
+
+
+    function statement(noindent) {
+        var i = indent, r, s = scope, t = nexttoken;
+
+        if (t.id === ";") {
+            advance(";");
+            return;
+        }
+
+// Is this a labelled statement?
+
+        if (t.identifier && !t.reserved && peek().id === ':') {
+            advance();
+            advance(':');
+            scope = Object.create(s);
+            addlabel(t.value, 'label');
+            if (!nexttoken.labelled) {
+                warning("Label '{a}' on {b} statement.",
+                        nexttoken, t.value, nexttoken.value);
+            }
+            if (jx.test(t.value + ':')) {
+                warning("Label '{a}' looks like a javascript url.",
+                        t, t.value);
+            }
+            nexttoken.label = t.value;
+            t = nexttoken;
+        }
+
+// Parse the statement.
+
+        if (!noindent) {
+            indentation();
+        }
+        r = expression(0, true);
+
+        // Look for the final semicolon.
+        if (!t.block) {
+            if (!option.expr && (!r || !r.exps)) {
+                warning("Expected an assignment or function call and instead saw an expression.",
+                    token);
+            } else if (option.nonew && r.id === '(' && r.left.id === 'new') {
+                warning("Do not use 'new' for side effects.");
+            }
+
+            if (nexttoken.id !== ';') {
+                if (!option.asi) {
+                    // If this is the last statement in a block that ends on
+                    // the same line *and* option lastsemic is on, ignore the warning.
+                    // Otherwise, complain about missing semicolon.
+                    if (!option.lastsemic || nexttoken.id !== '}' ||
+                            nexttoken.line !== token.line) {
+                        warningAt("Missing semicolon.", token.line, token.character);
+                    }
+                }
+            } else {
+                adjacent(token, nexttoken);
+                advance(';');
+                nonadjacent(token, nexttoken);
+            }
+        }
+
+// Restore the indentation.
+
+        indent = i;
+        scope = s;
+        return r;
+    }
+
+
+    function statements(startLine) {
+        var a = [], f, p;
+
+        while (!nexttoken.reach && nexttoken.id !== '(end)') {
+            if (nexttoken.id === ';') {
+                p = peek();
+                if (!p || p.id !== "(") {
+                    warning("Unnecessary semicolon.");
+                }
+                advance(';');
+            } else {
+                a.push(statement(startLine === nexttoken.line));
+            }
+        }
+        return a;
+    }
+
+
+    /*
+     * read all directives
+     * recognizes a simple form of asi, but always
+     * warns, if it is used
+     */
+    function directives() {
+        var i, p, pn;
+
+        for (;;) {
+            if (nexttoken.id === "(string)") {
+                p = peek(0);
+                if (p.id === "(endline)") {
+                    i = 1;
+                    do {
+                        pn = peek(i);
+                        i = i + 1;
+                    } while (pn.id === "(endline)");
+
+                    if (pn.id !== ";") {
+                        if (pn.id !== "(string)" && pn.id !== "(number)" &&
+                            pn.id !== "(regexp)" && pn.identifier !== true &&
+                            pn.id !== "}") {
+                            break;
+                        }
+                        warning("Missing semicolon.", nexttoken);
+                    } else {
+                        p = pn;
+                    }
+                } else if (p.id === "}") {
+                    // directive with no other statements, warn about missing semicolon
+                    warning("Missing semicolon.", p);
+                } else if (p.id !== ";") {
+                    break;
+                }
+
+                indentation();
+                advance();
+                if (directive[token.value]) {
+                    warning("Unnecessary directive \"{a}\".", token, token.value);
+                }
+
+                if (token.value === "use strict") {
+                    option.newcap = true;
+                    option.undef = true;
+                }
+
+                // there's no directive negation, so always set to true
+                directive[token.value] = true;
+
+                if (p.id === ";") {
+                    advance(";");
+                }
+                continue;
+            }
+            break;
+        }
+    }
+
+
+    /*
+     * Parses a single block. A block is a sequence of statements wrapped in
+     * braces.
+     *
+     * ordinary - true for everything but function bodies and try blocks.
+     * stmt     - true if block can be a single statement (e.g. in if/for/while).
+     * isfunc   - true if block is a function body
+     */
+    function block(ordinary, stmt, isfunc) {
+        var a,
+            b = inblock,
+            old_indent = indent,
+            m,
+            s = scope,
+            t,
+            line,
+            d;
+
+        inblock = ordinary;
+        if (!ordinary || !option.funcscope) scope = Object.create(scope);
+        nonadjacent(token, nexttoken);
+        t = nexttoken;
+
+        if (nexttoken.id === '{') {
+            advance('{');
+            line = token.line;
+            if (nexttoken.id !== '}') {
+                indent += option.indent;
+                while (!ordinary && nexttoken.from > indent) {
+                    indent += option.indent;
+                }
+
+                if (isfunc) {
+                    m = {};
+                    for (d in directive) {
+                        if (is_own(directive, d)) {
+                            m[d] = directive[d];
+                        }
+                    }
+                    directives();
+
+                    if (option.strict && funct['(context)']['(global)']) {
+                        if (!m["use strict"] && !directive["use strict"]) {
+                            warning("Missing \"use strict\" statement.");
+                        }
+                    }
+                }
+
+                a = statements(line);
+
+                if (isfunc) {
+                    directive = m;
+                }
+
+                indent -= option.indent;
+                if (line !== nexttoken.line) {
+                    indentation();
+                }
+            } else if (line !== nexttoken.line) {
+                indentation();
+            }
+            advance('}', t);
+            indent = old_indent;
+        } else if (!ordinary) {
+            error("Expected '{a}' and instead saw '{b}'.",
+                  nexttoken, '{', nexttoken.value);
+        } else {
+            if (!stmt || option.curly)
+                warning("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, '{', nexttoken.value);
+
+            noreach = true;
+            indent += option.indent;
+            // test indentation only if statement is in new line
+            a = [statement(nexttoken.line === token.line)];
+            indent -= option.indent;
+            noreach = false;
+        }
+        funct['(verb)'] = null;
+        if (!ordinary || !option.funcscope) scope = s;
+        inblock = b;
+        if (ordinary && option.noempty && (!a || a.length === 0)) {
+            warning("Empty block.");
+        }
+        return a;
+    }
+
+
+    function countMember(m) {
+        if (membersOnly && typeof membersOnly[m] !== 'boolean') {
+            warning("Unexpected /*member '{a}'.", token, m);
+        }
+        if (typeof member[m] === 'number') {
+            member[m] += 1;
+        } else {
+            member[m] = 1;
+        }
+    }
+
+
+    function note_implied(token) {
+        var name = token.value, line = token.line, a = implied[name];
+        if (typeof a === 'function') {
+            a = false;
+        }
+
+        if (!a) {
+            a = [line];
+            implied[name] = a;
+        } else if (a[a.length - 1] !== line) {
+            a.push(line);
+        }
+    }
+
+
+    // Build the syntax table by declaring the syntactic elements of the language.
+
+    type('(number)', function () {
+        return this;
+    });
+
+    type('(string)', function () {
+        return this;
+    });
+
+    syntax['(identifier)'] = {
+        type: '(identifier)',
+        lbp: 0,
+        identifier: true,
+        nud: function () {
+            var v = this.value,
+                s = scope[v],
+                f;
+
+            if (typeof s === 'function') {
+                // Protection against accidental inheritance.
+                s = undefined;
+            } else if (typeof s === 'boolean') {
+                f = funct;
+                funct = functions[0];
+                addlabel(v, 'var');
+                s = funct;
+                funct = f;
+            }
+
+            // The name is in scope and defined in the current function.
+            if (funct === s) {
+                // Change 'unused' to 'var', and reject labels.
+                switch (funct[v]) {
+                case 'unused':
+                    funct[v] = 'var';
+                    break;
+                case 'unction':
+                    funct[v] = 'function';
+                    this['function'] = true;
+                    break;
+                case 'function':
+                    this['function'] = true;
+                    break;
+                case 'label':
+                    warning("'{a}' is a statement label.", token, v);
+                    break;
+                }
+            } else if (funct['(global)']) {
+                // The name is not defined in the function.  If we are in the global
+                // scope, then we have an undefined variable.
+                //
+                // Operators typeof and delete do not raise runtime errors even if
+                // the base object of a reference is null so no need to display warning
+                // if we're inside of typeof or delete.
+
+                if (option.undef && typeof predefined[v] !== 'boolean') {
+                    // Attempting to subscript a null reference will throw an
+                    // error, even within the typeof and delete operators
+                    if (!(anonname === 'typeof' || anonname === 'delete') ||
+                        (nexttoken && (nexttoken.value === '.' || nexttoken.value === '['))) {
+
+                        isundef(funct, "'{a}' is not defined.", token, v);
+                    }
+                }
+                note_implied(token);
+            } else {
+                // If the name is already defined in the current
+                // function, but not as outer, then there is a scope error.
+
+                switch (funct[v]) {
+                case 'closure':
+                case 'function':
+                case 'var':
+                case 'unused':
+                    warning("'{a}' used out of scope.", token, v);
+                    break;
+                case 'label':
+                    warning("'{a}' is a statement label.", token, v);
+                    break;
+                case 'outer':
+                case 'global':
+                    break;
+                default:
+                    // If the name is defined in an outer function, make an outer entry,
+                    // and if it was unused, make it var.
+                    if (s === true) {
+                        funct[v] = true;
+                    } else if (s === null) {
+                        warning("'{a}' is not allowed.", token, v);
+                        note_implied(token);
+                    } else if (typeof s !== 'object') {
+                        // Operators typeof and delete do not raise runtime errors even
+                        // if the base object of a reference is null so no need to
+                        // display warning if we're inside of typeof or delete.
+                        if (option.undef) {
+                            // Attempting to subscript a null reference will throw an
+                            // error, even within the typeof and delete operators
+                            if (!(anonname === 'typeof' || anonname === 'delete') ||
+                                (nexttoken &&
+                                    (nexttoken.value === '.' || nexttoken.value === '['))) {
+
+                                isundef(funct, "'{a}' is not defined.", token, v);
+                            }
+                        }
+                        funct[v] = true;
+                        note_implied(token);
+                    } else {
+                        switch (s[v]) {
+                        case 'function':
+                        case 'unction':
+                            this['function'] = true;
+                            s[v] = 'closure';
+                            funct[v] = s['(global)'] ? 'global' : 'outer';
+                            break;
+                        case 'var':
+                        case 'unused':
+                            s[v] = 'closure';
+                            funct[v] = s['(global)'] ? 'global' : 'outer';
+                            break;
+                        case 'closure':
+                        case 'parameter':
+                            funct[v] = s['(global)'] ? 'global' : 'outer';
+                            break;
+                        case 'label':
+                            warning("'{a}' is a statement label.", token, v);
+                        }
+                    }
+                }
+            }
+            return this;
+        },
+        led: function () {
+            error("Expected an operator and instead saw '{a}'.",
+                nexttoken, nexttoken.value);
+        }
+    };
+
+    type('(regexp)', function () {
+        return this;
+    });
+
+
+// ECMAScript parser
+
+    delim('(endline)');
+    delim('(begin)');
+    delim('(end)').reach = true;
+    delim('</').reach = true;
+    delim('<!');
+    delim('<!--');
+    delim('-->');
+    delim('(error)').reach = true;
+    delim('}').reach = true;
+    delim(')');
+    delim(']');
+    delim('"').reach = true;
+    delim("'").reach = true;
+    delim(';');
+    delim(':').reach = true;
+    delim(',');
+    delim('#');
+    delim('@');
+    reserve('else');
+    reserve('case').reach = true;
+    reserve('catch');
+    reserve('default').reach = true;
+    reserve('finally');
+    reservevar('arguments', function (x) {
+        if (directive['use strict'] && funct['(global)']) {
+            warning("Strict violation.", x);
+        }
+    });
+    reservevar('eval');
+    reservevar('false');
+    reservevar('Infinity');
+    reservevar('NaN');
+    reservevar('null');
+    reservevar('this', function (x) {
+        if (directive['use strict'] && !option.validthis && ((funct['(statement)'] &&
+                funct['(name)'].charAt(0) > 'Z') || funct['(global)'])) {
+            warning("Possible strict violation.", x);
+        }
+    });
+    reservevar('true');
+    reservevar('undefined');
+    assignop('=', 'assign', 20);
+    assignop('+=', 'assignadd', 20);
+    assignop('-=', 'assignsub', 20);
+    assignop('*=', 'assignmult', 20);
+    assignop('/=', 'assigndiv', 20).nud = function () {
+        error("A regular expression literal can be confused with '/='.");
+    };
+    assignop('%=', 'assignmod', 20);
+    bitwiseassignop('&=', 'assignbitand', 20);
+    bitwiseassignop('|=', 'assignbitor', 20);
+    bitwiseassignop('^=', 'assignbitxor', 20);
+    bitwiseassignop('<<=', 'assignshiftleft', 20);
+    bitwiseassignop('>>=', 'assignshiftright', 20);
+    bitwiseassignop('>>>=', 'assignshiftrightunsigned', 20);
+    infix('?', function (left, that) {
+        that.left = left;
+        that.right = expression(10);
+        advance(':');
+        that['else'] = expression(10);
+        return that;
+    }, 30);
+
+    infix('||', 'or', 40);
+    infix('&&', 'and', 50);
+    bitwise('|', 'bitor', 70);
+    bitwise('^', 'bitxor', 80);
+    bitwise('&', 'bitand', 90);
+    relation('==', function (left, right) {
+        var eqnull = option.eqnull && (left.value === 'null' || right.value === 'null');
+
+        if (!eqnull && option.eqeqeq)
+            warning("Expected '{a}' and instead saw '{b}'.", this, '===', '==');
+        else if (isPoorRelation(left))
+            warning("Use '{a}' to compare with '{b}'.", this, '===', left.value);
+        else if (isPoorRelation(right))
+            warning("Use '{a}' to compare with '{b}'.", this, '===', right.value);
+
+        return this;
+    });
+    relation('===');
+    relation('!=', function (left, right) {
+        var eqnull = option.eqnull &&
+                (left.value === 'null' || right.value === 'null');
+
+        if (!eqnull && option.eqeqeq) {
+            warning("Expected '{a}' and instead saw '{b}'.",
+                    this, '!==', '!=');
+        } else if (isPoorRelation(left)) {
+            warning("Use '{a}' to compare with '{b}'.",
+                    this, '!==', left.value);
+        } else if (isPoorRelation(right)) {
+            warning("Use '{a}' to compare with '{b}'.",
+                    this, '!==', right.value);
+        }
+        return this;
+    });
+    relation('!==');
+    relation('<');
+    relation('>');
+    relation('<=');
+    relation('>=');
+    bitwise('<<', 'shiftleft', 120);
+    bitwise('>>', 'shiftright', 120);
+    bitwise('>>>', 'shiftrightunsigned', 120);
+    infix('in', 'in', 120);
+    infix('instanceof', 'instanceof', 120);
+    infix('+', function (left, that) {
+        var right = expression(130);
+        if (left && right && left.id === '(string)' && right.id === '(string)') {
+            left.value += right.value;
+            left.character = right.character;
+            if (!option.scripturl && jx.test(left.value)) {
+                warning("JavaScript URL.", left);
+            }
+            return left;
+        }
+        that.left = left;
+        that.right = right;
+        return that;
+    }, 130);
+    prefix('+', 'num');
+    prefix('+++', function () {
+        warning("Confusing pluses.");
+        this.right = expression(150);
+        this.arity = 'unary';
+        return this;
+    });
+    infix('+++', function (left) {
+        warning("Confusing pluses.");
+        this.left = left;
+        this.right = expression(130);
+        return this;
+    }, 130);
+    infix('-', 'sub', 130);
+    prefix('-', 'neg');
+    prefix('---', function () {
+        warning("Confusing minuses.");
+        this.right = expression(150);
+        this.arity = 'unary';
+        return this;
+    });
+    infix('---', function (left) {
+        warning("Confusing minuses.");
+        this.left = left;
+        this.right = expression(130);
+        return this;
+    }, 130);
+    infix('*', 'mult', 140);
+    infix('/', 'div', 140);
+    infix('%', 'mod', 140);
+
+    suffix('++', 'postinc');
+    prefix('++', 'preinc');
+    syntax['++'].exps = true;
+
+    suffix('--', 'postdec');
+    prefix('--', 'predec');
+    syntax['--'].exps = true;
+    prefix('delete', function () {
+        var p = expression(0);
+        if (!p || (p.id !== '.' && p.id !== '[')) {
+            warning("Variables should not be deleted.");
+        }
+        this.first = p;
+        return this;
+    }).exps = true;
+
+    prefix('~', function () {
+        if (option.bitwise) {
+            warning("Unexpected '{a}'.", this, '~');
+        }
+        expression(150);
+        return this;
+    });
+
+    prefix('!', function () {
+        this.right = expression(150);
+        this.arity = 'unary';
+        if (bang[this.right.id] === true) {
+            warning("Confusing use of '{a}'.", this, '!');
+        }
+        return this;
+    });
+    prefix('typeof', 'typeof');
+    prefix('new', function () {
+        var c = expression(155), i;
+        if (c && c.id !== 'function') {
+            if (c.identifier) {
+                c['new'] = true;
+                switch (c.value) {
+                case 'Object':
+                    warning("Use the object literal notation {}.", token);
+                    break;
+                case 'Number':
+                case 'String':
+                case 'Boolean':
+                case 'Math':
+                case 'JSON':
+                    warning("Do not use {a} as a constructor.", token, c.value);
+                    break;
+                case 'Function':
+                    if (!option.evil) {
+                        warning("The Function constructor is eval.");
+                    }
+                    break;
+                case 'Date':
+                case 'RegExp':
+                    break;
+                default:
+                    if (c.id !== 'function') {
+                        i = c.value.substr(0, 1);
+                        if (option.newcap && (i < 'A' || i > 'Z')) {
+                            warning("A constructor name should start with an uppercase letter.",
+                                token);
+                        }
+                    }
+                }
+            } else {
+                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
+                    warning("Bad constructor.", token);
+                }
+            }
+        } else {
+            if (!option.supernew)
+                warning("Weird construction. Delete 'new'.", this);
+        }
+        adjacent(token, nexttoken);
+        if (nexttoken.id !== '(' && !option.supernew) {
+            warning("Missing '()' invoking a constructor.");
+        }
+        this.first = c;
+        return this;
+    });
+    syntax['new'].exps = true;
+
+    prefix('void').exps = true;
+
+    infix('.', function (left, that) {
+        adjacent(prevtoken, token);
+        nobreak();
+        var m = identifier();
+        if (typeof m === 'string') {
+            countMember(m);
+        }
+        that.left = left;
+        that.right = m;
+        if (left && left.value === 'arguments' && (m === 'callee' || m === 'caller')) {
+            if (option.noarg)
+                warning("Avoid arguments.{a}.", left, m);
+            else if (directive['use strict'])
+                error('Strict violation.');
+        } else if (!option.evil && left && left.value === 'document' &&
+                (m === 'write' || m === 'writeln')) {
+            warning("document.write can be a form of eval.", left);
+        }
+        if (!option.evil && (m === 'eval' || m === 'execScript')) {
+            warning('eval is evil.');
+        }
+        return that;
+    }, 160, true);
+
+    infix('(', function (left, that) {
+        if (prevtoken.id !== '}' && prevtoken.id !== ')') {
+            nobreak(prevtoken, token);
+        }
+        nospace();
+        if (option.immed && !left.immed && left.id === 'function') {
+            warning("Wrap an immediate function invocation in parentheses " +
+                "to assist the reader in understanding that the expression " +
+                "is the result of a function, and not the function itself.");
+        }
+        var n = 0,
+            p = [];
+        if (left) {
+            if (left.type === '(identifier)') {
+                if (left.value.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
+                    if (left.value !== 'Number' && left.value !== 'String' &&
+                            left.value !== 'Boolean' &&
+                            left.value !== 'Date') {
+                        if (left.value === 'Math') {
+                            warning("Math is not a function.", left);
+                        } else if (option.newcap) {
+                            warning(
+"Missing 'new' prefix when invoking a constructor.", left);
+                        }
+                    }
+                }
+            }
+        }
+        if (nexttoken.id !== ')') {
+            for (;;) {
+                p[p.length] = expression(10);
+                n += 1;
+                if (nexttoken.id !== ',') {
+                    break;
+                }
+                comma();
+            }
+        }
+        advance(')');
+        nospace(prevtoken, token);
+        if (typeof left === 'object') {
+            if (left.value === 'parseInt' && n === 1) {
+                warning("Missing radix parameter.", left);
+            }
+            if (!option.evil) {
+                if (left.value === 'eval' || left.value === 'Function' ||
+                        left.value === 'execScript') {
+                    warning("eval is evil.", left);
+                } else if (p[0] && p[0].id === '(string)' &&
+                       (left.value === 'setTimeout' ||
+                        left.value === 'setInterval')) {
+                    warning(
+    "Implied eval is evil. Pass a function instead of a string.", left);
+                }
+            }
+            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
+                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
+                    left.id !== '?') {
+                warning("Bad invocation.", left);
+            }
+        }
+        that.left = left;
+        return that;
+    }, 155, true).exps = true;
+
+    prefix('(', function () {
+        nospace();
+        if (nexttoken.id === 'function') {
+            nexttoken.immed = true;
+        }
+        var v = expression(0);
+        advance(')', this);
+        nospace(prevtoken, token);
+        if (option.immed && v.id === 'function') {
+            if (nexttoken.id === '(' ||
+              (nexttoken.id === '.' && (peek().value === 'call' || peek().value === 'apply'))) {
+                warning(
+"Move the invocation into the parens that contain the function.", nexttoken);
+            } else {
+                warning(
+"Do not wrap function literals in parens unless they are to be immediately invoked.",
+                        this);
+            }
+        }
+        return v;
+    });
+
+    infix('[', function (left, that) {
+        nobreak(prevtoken, token);
+        nospace();
+        var e = expression(0), s;
+        if (e && e.type === '(string)') {
+            if (!option.evil && (e.value === 'eval' || e.value === 'execScript')) {
+                warning("eval is evil.", that);
+            }
+            countMember(e.value);
+            if (!option.sub && ix.test(e.value)) {
+                s = syntax[e.value];
+                if (!s || !s.reserved) {
+                    warning("['{a}'] is better written in dot notation.",
+                            e, e.value);
+                }
+            }
+        }
+        advance(']', that);
+        nospace(prevtoken, token);
+        that.left = left;
+        that.right = e;
+        return that;
+    }, 160, true);
+
+    prefix('[', function () {
+        var b = token.line !== nexttoken.line;
+        this.first = [];
+        if (b) {
+            indent += option.indent;
+            if (nexttoken.from === indent + option.indent) {
+                indent += option.indent;
+            }
+        }
+        while (nexttoken.id !== '(end)') {
+            while (nexttoken.id === ',') {
+                warning("Extra comma.");
+                advance(',');
+            }
+            if (nexttoken.id === ']') {
+                break;
+            }
+            if (b && token.line !== nexttoken.line) {
+                indentation();
+            }
+            this.first.push(expression(10));
+            if (nexttoken.id === ',') {
+                comma();
+                if (nexttoken.id === ']' && !option.es5) {
+                    warning("Extra comma.", token);
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+        if (b) {
+            indent -= option.indent;
+            indentation();
+        }
+        advance(']', this);
+        return this;
+    }, 160);
+
+
+    function property_name() {
+        var id = optionalidentifier(true);
+        if (!id) {
+            if (nexttoken.id === '(string)') {
+                id = nexttoken.value;
+                advance();
+            } else if (nexttoken.id === '(number)') {
+                id = nexttoken.value.toString();
+                advance();
+            }
+        }
+        return id;
+    }
+
+
+    function functionparams() {
+        var i, t = nexttoken, p = [];
+        advance('(');
+        nospace();
+        if (nexttoken.id === ')') {
+            advance(')');
+            return;
+        }
+        for (;;) {
+            i = identifier(true);
+            p.push(i);
+            addlabel(i, 'parameter');
+            if (nexttoken.id === ',') {
+                comma();
+            } else {
+                advance(')', t);
+                nospace(prevtoken, token);
+                return p;
+            }
+        }
+    }
+
+
+    function doFunction(i, statement) {
+        var f,
+            oldOption = option,
+            oldScope  = scope;
+
+        option = Object.create(option);
+        scope = Object.create(scope);
+
+        funct = {
+            '(name)'     : i || '"' + anonname + '"',
+            '(line)'     : nexttoken.line,
+            '(context)'  : funct,
+            '(breakage)' : 0,
+            '(loopage)'  : 0,
+            '(scope)'    : scope,
+            '(statement)': statement
+        };
+        f = funct;
+        token.funct = funct;
+        functions.push(funct);
+        if (i) {
+            addlabel(i, 'function');
+        }
+        funct['(params)'] = functionparams();
+
+        block(false, false, true);
+        scope = oldScope;
+        option = oldOption;
+        funct['(last)'] = token.line;
+        funct = funct['(context)'];
+        return f;
+    }
+
+
+    (function (x) {
+        x.nud = function () {
+            var b, f, i, j, p, t;
+            var props = {}; // All properties, including accessors
+
+            function saveProperty(name, token) {
+                if (props[name] && is_own(props, name))
+                    warning("Duplicate member '{a}'.", nexttoken, i);
+                else
+                    props[name] = {};
+
+                props[name].basic = true;
+                props[name].basicToken = token;
+            }
+
+            function saveSetter(name, token) {
+                if (props[name] && is_own(props, name)) {
+                    if (props[name].basic || props[name].setter)
+                        warning("Duplicate member '{a}'.", nexttoken, i);
+                } else {
+                    props[name] = {};
+                }
+
+                props[name].setter = true;
+                props[name].setterToken = token;
+            }
+
+            function saveGetter(name) {
+                if (props[name] && is_own(props, name)) {
+                    if (props[name].basic || props[name].getter)
+                        warning("Duplicate member '{a}'.", nexttoken, i);
+                } else {
+                    props[name] = {};
+                }
+
+                props[name].getter = true;
+                props[name].getterToken = token;
+            }
+
+            b = token.line !== nexttoken.line;
+            if (b) {
+                indent += option.indent;
+                if (nexttoken.from === indent + option.indent) {
+                    indent += option.indent;
+                }
+            }
+            for (;;) {
+                if (nexttoken.id === '}') {
+                    break;
+                }
+                if (b) {
+                    indentation();
+                }
+                if (nexttoken.value === 'get' && peek().id !== ':') {
+                    advance('get');
+                    if (!option.es5) {
+                        error("get/set are ES5 features.");
+                    }
+                    i = property_name();
+                    if (!i) {
+                        error("Missing property name.");
+                    }
+                    saveGetter(i);
+                    t = nexttoken;
+                    adjacent(token, nexttoken);
+                    f = doFunction();
+                    p = f['(params)'];
+                    if (p) {
+                        warning("Unexpected parameter '{a}' in get {b} function.", t, p[0], i);
+                    }
+                    adjacent(token, nexttoken);
+                } else if (nexttoken.value === 'set' && peek().id !== ':') {
+                    advance('set');
+                    if (!option.es5) {
+                        error("get/set are ES5 features.");
+                    }
+                    i = property_name();
+                    if (!i) {
+                        error("Missing property name.");
+                    }
+                    saveSetter(i, nexttoken);
+                    t = nexttoken;
+                    adjacent(token, nexttoken);
+                    f = doFunction();
+                    p = f['(params)'];
+                    if (!p || p.length !== 1) {
+                        warning("Expected a single parameter in set {a} function.", t, i);
+                    }
+                } else {
+                    i = property_name();
+                    saveProperty(i, nexttoken);
+                    if (typeof i !== 'string') {
+                        break;
+                    }
+                    advance(':');
+                    nonadjacent(token, nexttoken);
+                    expression(10);
+                }
+
+                countMember(i);
+                if (nexttoken.id === ',') {
+                    comma();
+                    if (nexttoken.id === ',') {
+                        warning("Extra comma.", token);
+                    } else if (nexttoken.id === '}' && !option.es5) {
+                        warning("Extra comma.", token);
+                    }
+                } else {
+                    break;
+                }
+            }
+            if (b) {
+                indent -= option.indent;
+                indentation();
+            }
+            advance('}', this);
+
+            // Check for lonely setters if in the ES5 mode.
+            if (option.es5) {
+                for (var name in props) {
+                    if (is_own(props, name) && props[name].setter && !props[name].getter) {
+                        warning("Setter is defined without getter.", props[name].setterToken);
+                    }
+                }
+            }
+            return this;
+        };
+        x.fud = function () {
+            error("Expected to see a statement and instead saw a block.", token);
+        };
+    }(delim('{')));
+
+// This Function is called when esnext option is set to true
+// it adds the `const` statement to JSHINT
+
+    useESNextSyntax = function () {
+        var conststatement = stmt('const', function (prefix) {
+            var id, name, value;
+
+            this.first = [];
+            for (;;) {
+                nonadjacent(token, nexttoken);
+                id = identifier();
+                if (funct[id] === "const") {
+                    warning("const '" + id + "' has already been declared");
+                }
+                if (funct['(global)'] && predefined[id] === false) {
+                    warning("Redefinition of '{a}'.", token, id);
+                }
+                addlabel(id, 'const');
+                if (prefix) {
+                    break;
+                }
+                name = token;
+                this.first.push(token);
+
+                if (nexttoken.id !== "=") {
+                    warning("const " +
+                      "'{a}' is initialized to 'undefined'.", token, id);
+                }
+
+                if (nexttoken.id === '=') {
+                    nonadjacent(token, nexttoken);
+                    advance('=');
+                    nonadjacent(token, nexttoken);
+                    if (nexttoken.id === 'undefined') {
+                        warning("It is not necessary to initialize " +
+                          "'{a}' to 'undefined'.", token, id);
+                    }
+                    if (peek(0).id === '=' && nexttoken.identifier) {
+                        error("Constant {a} was not declared correctly.",
+                                nexttoken, nexttoken.value);
+                    }
+                    value = expression(0);
+                    name.first = value;
+                }
+
+                if (nexttoken.id !== ',') {
+                    break;
+                }
+                comma();
+            }
+            return this;
+        });
+        conststatement.exps = true;
+    };
+
+    var varstatement = stmt('var', function (prefix) {
+        // JavaScript does not have block scope. It only has function scope. So,
+        // declaring a variable in a block can have unexpected consequences.
+        var id, name, value;
+
+        if (funct['(onevar)'] && option.onevar) {
+            warning("Too many var statements.");
+        } else if (!funct['(global)']) {
+            funct['(onevar)'] = true;
+        }
+        this.first = [];
+        for (;;) {
+            nonadjacent(token, nexttoken);
+            id = identifier();
+            if (option.esnext && funct[id] === "const") {
+                warning("const '" + id + "' has already been declared");
+            }
+            if (funct['(global)'] && predefined[id] === false) {
+                warning("Redefinition of '{a}'.", token, id);
+            }
+            addlabel(id, 'unused');
+            if (prefix) {
+                break;
+            }
+            name = token;
+            this.first.push(token);
+            if (nexttoken.id === '=') {
+                nonadjacent(token, nexttoken);
+                advance('=');
+                nonadjacent(token, nexttoken);
+                if (nexttoken.id === 'undefined') {
+                    warning("It is not necessary to initialize '{a}' to 'undefined'.", token, id);
+                }
+                if (peek(0).id === '=' && nexttoken.identifier) {
+                    error("Variable {a} was not declared correctly.",
+                            nexttoken, nexttoken.value);
+                }
+                value = expression(0);
+                name.first = value;
+            }
+            if (nexttoken.id !== ',') {
+                break;
+            }
+            comma();
+        }
+        return this;
+    });
+    varstatement.exps = true;
+
+    blockstmt('function', function () {
+        if (inblock) {
+            warning("Function declarations should not be placed in blocks. " +
+                "Use a function expression or move the statement to the top of " +
+                "the outer function.", token);
+
+        }
+        var i = identifier();
+        if (option.esnext && funct[i] === "const") {
+            warning("const '" + i + "' has already been declared");
+        }
+        adjacent(token, nexttoken);
+        addlabel(i, 'unction');
+        doFunction(i, true);
+        if (nexttoken.id === '(' && nexttoken.line === token.line) {
+            error(
+"Function declarations are not invocable. Wrap the whole function invocation in parens.");
+        }
+        return this;
+    });
+
+    prefix('function', function () {
+        var i = optionalidentifier();
+        if (i) {
+            adjacent(token, nexttoken);
+        } else {
+            nonadjacent(token, nexttoken);
+        }
+        doFunction(i);
+        if (!option.loopfunc && funct['(loopage)']) {
+            warning("Don't make functions within a loop.");
+        }
+        return this;
+    });
+
+    blockstmt('if', function () {
+        var t = nexttoken;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        expression(20);
+        if (nexttoken.id === '=') {
+            if (!option.boss)
+                warning("Expected a conditional expression and instead saw an assignment.");
+            advance('=');
+            expression(20);
+        }
+        advance(')', t);
+        nospace(prevtoken, token);
+        block(true, true);
+        if (nexttoken.id === 'else') {
+            nonadjacent(token, nexttoken);
+            advance('else');
+            if (nexttoken.id === 'if' || nexttoken.id === 'switch') {
+                statement(true);
+            } else {
+                block(true, true);
+            }
+        }
+        return this;
+    });
+
+    blockstmt('try', function () {
+        var b, e, s;
+
+        block(false);
+        if (nexttoken.id === 'catch') {
+            advance('catch');
+            nonadjacent(token, nexttoken);
+            advance('(');
+            s = scope;
+            scope = Object.create(s);
+            e = nexttoken.value;
+            if (nexttoken.type !== '(identifier)') {
+                warning("Expected an identifier and instead saw '{a}'.",
+                    nexttoken, e);
+            } else {
+                addlabel(e, 'exception');
+            }
+            advance();
+            advance(')');
+            block(false);
+            b = true;
+            scope = s;
+        }
+        if (nexttoken.id === 'finally') {
+            advance('finally');
+            block(false);
+            return;
+        } else if (!b) {
+            error("Expected '{a}' and instead saw '{b}'.",
+                    nexttoken, 'catch', nexttoken.value);
+        }
+        return this;
+    });
+
+    blockstmt('while', function () {
+        var t = nexttoken;
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        expression(20);
+        if (nexttoken.id === '=') {
+            if (!option.boss)
+                warning("Expected a conditional expression and instead saw an assignment.");
+            advance('=');
+            expression(20);
+        }
+        advance(')', t);
+        nospace(prevtoken, token);
+        block(true, true);
+        funct['(breakage)'] -= 1;
+        funct['(loopage)'] -= 1;
+        return this;
+    }).labelled = true;
+
+    reserve('with');
+
+    blockstmt('switch', function () {
+        var t = nexttoken,
+            g = false;
+        funct['(breakage)'] += 1;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        this.condition = expression(20);
+        advance(')', t);
+        nospace(prevtoken, token);
+        nonadjacent(token, nexttoken);
+        t = nexttoken;
+        advance('{');
+        nonadjacent(token, nexttoken);
+        indent += option.indent;
+        this.cases = [];
+        for (;;) {
+            switch (nexttoken.id) {
+            case 'case':
+                switch (funct['(verb)']) {
+                case 'break':
+                case 'case':
+                case 'continue':
+                case 'return':
+                case 'switch':
+                case 'throw':
+                    break;
+                default:
+                    // You can tell JSHint that you don't use break intentionally by
+                    // adding a comment /* falls through */ on a line just before
+                    // the next `case`.
+                    if (!ft.test(lines[nexttoken.line - 2])) {
+                        warning(
+                            "Expected a 'break' statement before 'case'.",
+                            token);
+                    }
+                }
+                indentation(-option.indent);
+                advance('case');
+                this.cases.push(expression(20));
+                g = true;
+                advance(':');
+                funct['(verb)'] = 'case';
+                break;
+            case 'default':
+                switch (funct['(verb)']) {
+                case 'break':
+                case 'continue':
+                case 'return':
+                case 'throw':
+                    break;
+                default:
+                    if (!ft.test(lines[nexttoken.line - 2])) {
+                        warning(
+                            "Expected a 'break' statement before 'default'.",
+                            token);
+                    }
+                }
+                indentation(-option.indent);
+                advance('default');
+                g = true;
+                advance(':');
+                break;
+            case '}':
+                indent -= option.indent;
+                indentation();
+                advance('}', t);
+                if (this.cases.length === 1 || this.condition.id === 'true' ||
+                        this.condition.id === 'false') {
+                    if (!option.onecase)
+                        warning("This 'switch' should be an 'if'.", this);
+                }
+                funct['(breakage)'] -= 1;
+                funct['(verb)'] = undefined;
+                return;
+            case '(end)':
+                error("Missing '{a}'.", nexttoken, '}');
+                return;
+            default:
+                if (g) {
+                    switch (token.id) {
+                    case ',':
+                        error("Each value should have its own case label.");
+                        return;
+                    case ':':
+                        g = false;
+                        statements();
+                        break;
+                    default:
+                        error("Missing ':' on a case clause.", token);
+                        return;
+                    }
+                } else {
+                    if (token.id === ':') {
+                        advance(':');
+                        error("Unexpected '{a}'.", token, ':');
+                        statements();
+                    } else {
+                        error("Expected '{a}' and instead saw '{b}'.",
+                            nexttoken, 'case', nexttoken.value);
+                        return;
+                    }
+                }
+            }
+        }
+    }).labelled = true;
+
+    stmt('debugger', function () {
+        if (!option.debug) {
+            warning("All 'debugger' statements should be removed.");
+        }
+        return this;
+    }).exps = true;
+
+    (function () {
+        var x = stmt('do', function () {
+            funct['(breakage)'] += 1;
+            funct['(loopage)'] += 1;
+            this.first = block(true);
+            advance('while');
+            var t = nexttoken;
+            nonadjacent(token, t);
+            advance('(');
+            nospace();
+            expression(20);
+            if (nexttoken.id === '=') {
+                if (!option.boss)
+                    warning("Expected a conditional expression and instead saw an assignment.");
+                advance('=');
+                expression(20);
+            }
+            advance(')', t);
+            nospace(prevtoken, token);
+            funct['(breakage)'] -= 1;
+            funct['(loopage)'] -= 1;
+            return this;
+        });
+        x.labelled = true;
+        x.exps = true;
+    }());
+
+    blockstmt('for', function () {
+        var s, t = nexttoken;
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        advance('(');
+        nonadjacent(this, t);
+        nospace();
+        if (peek(nexttoken.id === 'var' ? 1 : 0).id === 'in') {
+            if (nexttoken.id === 'var') {
+                advance('var');
+                varstatement.fud.call(varstatement, true);
+            } else {
+                switch (funct[nexttoken.value]) {
+                case 'unused':
+                    funct[nexttoken.value] = 'var';
+                    break;
+                case 'var':
+                    break;
+                default:
+                    warning("Bad for in variable '{a}'.",
+                            nexttoken, nexttoken.value);
+                }
+                advance();
+            }
+            advance('in');
+            expression(20);
+            advance(')', t);
+            s = block(true, true);
+            if (option.forin && s && (s.length > 1 || typeof s[0] !== 'object' ||
+                    s[0].value !== 'if')) {
+                warning("The body of a for in should be wrapped in an if statement to filter " +
+                        "unwanted properties from the prototype.", this);
+            }
+            funct['(breakage)'] -= 1;
+            funct['(loopage)'] -= 1;
+            return this;
+        } else {
+            if (nexttoken.id !== ';') {
+                if (nexttoken.id === 'var') {
+                    advance('var');
+                    varstatement.fud.call(varstatement);
+                } else {
+                    for (;;) {
+                        expression(0, 'for');
+                        if (nexttoken.id !== ',') {
+                            break;
+                        }
+                        comma();
+                    }
+                }
+            }
+            nolinebreak(token);
+            advance(';');
+            if (nexttoken.id !== ';') {
+                expression(20);
+                if (nexttoken.id === '=') {
+                    if (!option.boss)
+                        warning("Expected a conditional expression and instead saw an assignment.");
+                    advance('=');
+                    expression(20);
+                }
+            }
+            nolinebreak(token);
+            advance(';');
+            if (nexttoken.id === ';') {
+                error("Expected '{a}' and instead saw '{b}'.",
+                        nexttoken, ')', ';');
+            }
+            if (nexttoken.id !== ')') {
+                for (;;) {
+                    expression(0, 'for');
+                    if (nexttoken.id !== ',') {
+                        break;
+                    }
+                    comma();
+                }
+            }
+            advance(')', t);
+            nospace(prevtoken, token);
+            block(true, true);
+            funct['(breakage)'] -= 1;
+            funct['(loopage)'] -= 1;
+            return this;
+        }
+    }).labelled = true;
+
+
+    stmt('break', function () {
+        var v = nexttoken.value;
+
+        if (funct['(breakage)'] === 0)
+            warning("Unexpected '{a}'.", nexttoken, this.value);
+
+        if (!option.asi)
+            nolinebreak(this);
+
+        if (nexttoken.id !== ';') {
+            if (token.line === nexttoken.line) {
+                if (funct[v] !== 'label') {
+                    warning("'{a}' is not a statement label.", nexttoken, v);
+                } else if (scope[v] !== funct) {
+                    warning("'{a}' is out of scope.", nexttoken, v);
+                }
+                this.first = nexttoken;
+                advance();
+            }
+        }
+        reachable('break');
+        return this;
+    }).exps = true;
+
+
+    stmt('continue', function () {
+        var v = nexttoken.value;
+
+        if (funct['(breakage)'] === 0)
+            warning("Unexpected '{a}'.", nexttoken, this.value);
+
+        if (!option.asi)
+            nolinebreak(this);
+
+        if (nexttoken.id !== ';') {
+            if (token.line === nexttoken.line) {
+                if (funct[v] !== 'label') {
+                    warning("'{a}' is not a statement label.", nexttoken, v);
+                } else if (scope[v] !== funct) {
+                    warning("'{a}' is out of scope.", nexttoken, v);
+                }
+                this.first = nexttoken;
+                advance();
+            }
+        } else if (!funct['(loopage)']) {
+            warning("Unexpected '{a}'.", nexttoken, this.value);
+        }
+        reachable('continue');
+        return this;
+    }).exps = true;
+
+
+    stmt('return', function () {
+        if (this.line === nexttoken.line) {
+            if (nexttoken.id === '(regexp)')
+                warning("Wrap the /regexp/ literal in parens to disambiguate the slash operator.");
+
+            if (nexttoken.id !== ';' && !nexttoken.reach) {
+                nonadjacent(token, nexttoken);
+                if (peek().value === "=" && !option.boss) {
+                    warningAt("Did you mean to return a conditional instead of an assignment?",
+                              token.line, token.character + 1);
+                }
+                this.first = expression(0);
+            }
+        } else if (!option.asi) {
+            nolinebreak(this); // always warn (Line breaking error)
+        }
+        reachable('return');
+        return this;
+    }).exps = true;
+
+
+    stmt('throw', function () {
+        nolinebreak(this);
+        nonadjacent(token, nexttoken);
+        this.first = expression(20);
+        reachable('throw');
+        return this;
+    }).exps = true;
+
+//  Superfluous reserved words
+
+    reserve('class');
+    reserve('const');
+    reserve('enum');
+    reserve('export');
+    reserve('extends');
+    reserve('import');
+    reserve('super');
+
+    reserve('let');
+    reserve('yield');
+    reserve('implements');
+    reserve('interface');
+    reserve('package');
+    reserve('private');
+    reserve('protected');
+    reserve('public');
+    reserve('static');
+
+
+// Parse JSON
+
+    function jsonValue() {
+
+        function jsonObject() {
+            var o = {}, t = nexttoken;
+            advance('{');
+            if (nexttoken.id !== '}') {
+                for (;;) {
+                    if (nexttoken.id === '(end)') {
+                        error("Missing '}' to match '{' from line {a}.",
+                                nexttoken, t.line);
+                    } else if (nexttoken.id === '}') {
+                        warning("Unexpected comma.", token);
+                        break;
+                    } else if (nexttoken.id === ',') {
+                        error("Unexpected comma.", nexttoken);
+                    } else if (nexttoken.id !== '(string)') {
+                        warning("Expected a string and instead saw {a}.",
+                                nexttoken, nexttoken.value);
+                    }
+                    if (o[nexttoken.value] === true) {
+                        warning("Duplicate key '{a}'.",
+                                nexttoken, nexttoken.value);
+                    } else if ((nexttoken.value === '__proto__' &&
+                        !option.proto) || (nexttoken.value === '__iterator__' &&
+                        !option.iterator)) {
+                        warning("The '{a}' key may produce unexpected results.",
+                            nexttoken, nexttoken.value);
+                    } else {
+                        o[nexttoken.value] = true;
+                    }
+                    advance();
+                    advance(':');
+                    jsonValue();
+                    if (nexttoken.id !== ',') {
+                        break;
+                    }
+                    advance(',');
+                }
+            }
+            advance('}');
+        }
+
+        function jsonArray() {
+            var t = nexttoken;
+            advance('[');
+            if (nexttoken.id !== ']') {
+                for (;;) {
+                    if (nexttoken.id === '(end)') {
+                        error("Missing ']' to match '[' from line {a}.",
+                                nexttoken, t.line);
+                    } else if (nexttoken.id === ']') {
+                        warning("Unexpected comma.", token);
+                        break;
+                    } else if (nexttoken.id === ',') {
+                        error("Unexpected comma.", nexttoken);
+                    }
+                    jsonValue();
+                    if (nexttoken.id !== ',') {
+                        break;
+                    }
+                    advance(',');
+                }
+            }
+            advance(']');
+        }
+
+        switch (nexttoken.id) {
+        case '{':
+            jsonObject();
+            break;
+        case '[':
+            jsonArray();
+            break;
+        case 'true':
+        case 'false':
+        case 'null':
+        case '(number)':
+        case '(string)':
+            advance();
+            break;
+        case '-':
+            advance('-');
+            if (token.character !== nexttoken.from) {
+                warning("Unexpected space after '-'.", token);
+            }
+            adjacent(token, nexttoken);
+            advance('(number)');
+            break;
+        default:
+            error("Expected a JSON value.", nexttoken);
+        }
+    }
+
+
+// The actual JSHINT function itself.
+
+    var itself = function (s, o, g) {
+        var a, i, k;
+        JSHINT.errors = [];
+        JSHINT.undefs = [];
+        predefined = Object.create(standard);
+        combine(predefined, g || {});
+        if (o) {
+            a = o.predef;
+            if (a) {
+                if (Array.isArray(a)) {
+                    for (i = 0; i < a.length; i += 1) {
+                        predefined[a[i]] = true;
+                    }
+                } else if (typeof a === 'object') {
+                    k = Object.keys(a);
+                    for (i = 0; i < k.length; i += 1) {
+                        predefined[k[i]] = !!a[k[i]];
+                    }
+                }
+            }
+            option = o;
+        } else {
+            option = {};
+        }
+        option.indent = option.indent || 4;
+        option.maxerr = option.maxerr || 50;
+
+        tab = '';
+        for (i = 0; i < option.indent; i += 1) {
+            tab += ' ';
+        }
+        indent = 1;
+        global = Object.create(predefined);
+        scope = global;
+        funct = {
+            '(global)': true,
+            '(name)': '(global)',
+            '(scope)': scope,
+            '(breakage)': 0,
+            '(loopage)': 0
+        };
+        functions = [funct];
+        urls = [];
+        stack = null;
+        member = {};
+        membersOnly = null;
+        implied = {};
+        inblock = false;
+        lookahead = [];
+        jsonmode = false;
+        warnings = 0;
+        lex.init(s);
+        prereg = true;
+        directive = {};
+
+        prevtoken = token = nexttoken = syntax['(begin)'];
+        assume();
+
+        // combine the passed globals after we've assumed all our options
+        combine(predefined, g || {});
+
+        try {
+            advance();
+            switch (nexttoken.id) {
+            case '{':
+            case '[':
+                option.laxbreak = true;
+                jsonmode = true;
+                jsonValue();
+                break;
+            default:
+                directives();
+                if (directive["use strict"] && !option.globalstrict) {
+                    warning("Use the function form of \"use strict\".", prevtoken);
+                }
+
+                statements();
+            }
+            advance('(end)');
+
+            var markDefined = function (name, context) {
+                do {
+                    if (typeof context[name] === 'string') {
+                        // JSHINT marks unused variables as 'unused' and
+                        // unused function declaration as 'unction'. This
+                        // code changes such instances back 'var' and
+                        // 'closure' so that the code in JSHINT.data()
+                        // doesn't think they're unused.
+
+                        if (context[name] === 'unused')
+                            context[name] = 'var';
+                        else if (context[name] === 'unction')
+                            context[name] = 'closure';
+
+                        return true;
+                    }
+
+                    context = context['(context)'];
+                } while (context);
+
+                return false;
+            };
+
+            var clearImplied = function (name, line) {
+                if (!implied[name])
+                    return;
+
+                var newImplied = [];
+                for (var i = 0; i < implied[name].length; i += 1) {
+                    if (implied[name][i] !== line)
+                        newImplied.push(implied[name][i]);
+                }
+
+                if (newImplied.length === 0)
+                    delete implied[name];
+                else
+                    implied[name] = newImplied;
+            };
+
+            // Check queued 'x is not defined' instances to see if they're still undefined.
+            for (i = 0; i < JSHINT.undefs.length; i += 1) {
+                k = JSHINT.undefs[i].slice(0);
+
+                if (markDefined(k[2].value, k[0])) {
+                    clearImplied(k[2].value, k[2].line);
+                } else {
+                    warning.apply(warning, k.slice(1));
+                }
+            }
+        } catch (e) {
+            if (e) {
+                var nt = nexttoken || {};
+                JSHINT.errors.push({
+                    raw       : e.raw,
+                    reason    : e.message,
+                    line      : e.line || nt.line,
+                    character : e.character || nt.from
+                }, null);
+            }
+        }
+
+        return JSHINT.errors.length === 0;
+    };
+
+    // Data summary.
+    itself.data = function () {
+
+        var data = { functions: [], options: option }, fu, globals, implieds = [], f, i, j,
+            members = [], n, unused = [], v;
+        if (itself.errors.length) {
+            data.errors = itself.errors;
+        }
+
+        if (jsonmode) {
+            data.json = true;
+        }
+
+        for (n in implied) {
+            if (is_own(implied, n)) {
+                implieds.push({
+                    name: n,
+                    line: implied[n]
+                });
+            }
+        }
+        if (implieds.length > 0) {
+            data.implieds = implieds;
+        }
+
+        if (urls.length > 0) {
+            data.urls = urls;
+        }
+
+        globals = Object.keys(scope);
+        if (globals.length > 0) {
+            data.globals = globals;
+        }
+        for (i = 1; i < functions.length; i += 1) {
+            f = functions[i];
+            fu = {};
+            for (j = 0; j < functionicity.length; j += 1) {
+                fu[functionicity[j]] = [];
+            }
+            for (n in f) {
+                if (is_own(f, n) && n.charAt(0) !== '(') {
+                    v = f[n];
+                    if (v === 'unction') {
+                        v = 'unused';
+                    }
+                    if (Array.isArray(fu[v])) {
+                        fu[v].push(n);
+                        if (v === 'unused') {
+                            unused.push({
+                                name: n,
+                                line: f['(line)'],
+                                'function': f['(name)']
+                            });
+                        }
+                    }
+                }
+            }
+            for (j = 0; j < functionicity.length; j += 1) {
+                if (fu[functionicity[j]].length === 0) {
+                    delete fu[functionicity[j]];
+                }
+            }
+            fu.name = f['(name)'];
+            fu.param = f['(params)'];
+            fu.line = f['(line)'];
+            fu.last = f['(last)'];
+            data.functions.push(fu);
+        }
+
+        if (unused.length > 0) {
+            data.unused = unused;
+        }
+
+        members = [];
+        for (n in member) {
+            if (typeof member[n] === 'number') {
+                data.member = member;
+                break;
+            }
+        }
+
+        return data;
+    };
+
+    itself.report = function (option) {
+        var data = itself.data();
+
+        var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
+
+        function detail(h, array) {
+            var b, i, singularity;
+            if (array) {
+                o.push('<div><i>' + h + '</i> ');
+                array = array.sort();
+                for (i = 0; i < array.length; i += 1) {
+                    if (array[i] !== singularity) {
+                        singularity = array[i];
+                        o.push((b ? ', ' : '') + singularity);
+                        b = true;
+                    }
+                }
+                o.push('</div>');
+            }
+        }
+
+
+        if (data.errors || data.implieds || data.unused) {
+            err = true;
+            o.push('<div id=errors><i>Error:</i>');
+            if (data.errors) {
+                for (i = 0; i < data.errors.length; i += 1) {
+                    c = data.errors[i];
+                    if (c) {
+                        e = c.evidence || '';
+                        o.push('<p>Problem' + (isFinite(c.line) ? ' at line ' +
+                                c.line + ' character ' + c.character : '') +
+                                ': ' + c.reason.entityify() +
+                                '</p><p class=evidence>' +
+                                (e && (e.length > 80 ? e.slice(0, 77) + '...' :
+                                e).entityify()) + '</p>');
+                    }
+                }
+            }
+
+            if (data.implieds) {
+                s = [];
+                for (i = 0; i < data.implieds.length; i += 1) {
+                    s[i] = '<code>' + data.implieds[i].name + '</code>&nbsp;<i>' +
+                        data.implieds[i].line + '</i>';
+                }
+                o.push('<p><i>Implied global:</i> ' + s.join(', ') + '</p>');
+            }
+
+            if (data.unused) {
+                s = [];
+                for (i = 0; i < data.unused.length; i += 1) {
+                    s[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
+                        data.unused[i].line + '</i> <code>' +
+                        data.unused[i]['function'] + '</code>';
+                }
+                o.push('<p><i>Unused variable:</i> ' + s.join(', ') + '</p>');
+            }
+            if (data.json) {
+                o.push('<p>JSON: bad.</p>');
+            }
+            o.push('</div>');
+        }
+
+        if (!option) {
+
+            o.push('<br><div id=functions>');
+
+            if (data.urls) {
+                detail("URLs<br>", data.urls, '<br>');
+            }
+
+            if (data.json && !err) {
+                o.push('<p>JSON: good.</p>');
+            } else if (data.globals) {
+                o.push('<div><i>Global</i> ' +
+                        data.globals.sort().join(', ') + '</div>');
+            } else {
+                o.push('<div><i>No new global variables introduced.</i></div>');
+            }
+
+            for (i = 0; i < data.functions.length; i += 1) {
+                f = data.functions[i];
+
+                o.push('<br><div class=function><i>' + f.line + '-' +
+                        f.last + '</i> ' + (f.name || '') + '(' +
+                        (f.param ? f.param.join(', ') : '') + ')</div>');
+                detail('<big><b>Unused</b></big>', f.unused);
+                detail('Closure', f.closure);
+                detail('Variable', f['var']);
+                detail('Exception', f.exception);
+                detail('Outer', f.outer);
+                detail('Global', f.global);
+                detail('Label', f.label);
+            }
+
+            if (data.member) {
+                a = Object.keys(data.member);
+                if (a.length) {
+                    a = a.sort();
+                    m = '<br><pre id=members>/*members ';
+                    l = 10;
+                    for (i = 0; i < a.length; i += 1) {
+                        k = a[i];
+                        n = k.name();
+                        if (l + n.length > 72) {
+                            o.push(m + '<br>');
+                            m = '    ';
+                            l = 1;
+                        }
+                        l += n.length + 2;
+                        if (data.member[k] === 1) {
+                            n = '<i>' + n + '</i>';
+                        }
+                        if (i < a.length - 1) {
+                            n += ', ';
+                        }
+                        m += n;
+                    }
+                    o.push(m + '<br>*/</pre>');
+                }
+                o.push('</div>');
+            }
+        }
+        return o.join('');
+    };
+
+    itself.jshint = itself;
+
+    return itself;
+}());
+
+// Make JSHINT a Node module, if possible.
+if (typeof exports === 'object' && exports)
+    exports.JSHINT = JSHINT;
diff --git a/tests/resource_loader.js b/tests/resource_loader.js
index c8dec4881..9a03411a2 100644
--- a/tests/resource_loader.js
+++ b/tests/resource_loader.js
@@ -24,8 +24,9 @@ function includeScript( url ) {
 
 window.loadResources = min ?
 	function() {
-		includeStyle( "build/dist/theme/jquery-ui.min.css" );
-		includeScript( "build/dist/jquery-ui.min.js" );
+		// TODO: proper include with theme images
+		includeStyle( "dist/jquery-ui.min.css" );
+		includeScript( "dist/jquery-ui.min.js" );
 	} :
 	function( resources ) {
 		$.each( resources.css || [], function( i, resource ) {
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index a877e38af..70d035684 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -1,7 +1,41 @@
-(function() {
+(function( $ ) {
 
 window.TestHelpers = {};
 
+function testJshint( widget ) {
+	if ( QUnit.urlParams.nojshint ) {
+		return;
+	}
+
+	document.write( "<script src='../../../external/jshint.js'></script>" );
+	asyncTest( "JSHint", function() {
+		expect( 1 );
+
+		$.when(
+			$.ajax({
+				url: "../../../ui/.jshintrc",
+				dataType: "json"
+			}),
+			$.ajax({
+				url: "../../../ui/jquery.ui." + widget + ".js",
+				dataType: "text"
+			})
+		).done(function( hintArgs, srcArgs ) {
+			var passed = JSHINT( srcArgs[ 0 ], hintArgs[ 0 ] ),
+				errors = $.map( JSHINT.errors, function( error ) {
+					return "[L" + error.line + ":C" + error.character + "] " +
+						error.reason + "\n" + error.evidence + "\n";
+				}).join( "\n" );
+			ok( passed, errors );
+			start();
+		})
+		.fail(function() {
+			ok( false, "error loading source" );
+			start();
+		});
+	});
+}
+
 function testWidgetDefaults( widget, defaults ) {
 	var pluginDefaults = $.ui[ widget ].prototype.options;
 
@@ -59,6 +93,7 @@ function testBasicUsage( widget ) {
 TestHelpers.commonWidgetTests = function( widget, settings ) {
 	module( widget + ": common widget" );
 
+	testJshint( widget );
 	testWidgetDefaults( widget, settings.defaults );
 	testWidgetOverrides( widget );
 	testBasicUsage( widget );
@@ -106,4 +141,4 @@ window.domEqual = function( selector, modifier, message ) {
 	QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
 };
 
-}());
+}( jQuery ));
-- 
cgit v1.2.3


From 7a5a77da50e5e2401043410434c49971ce504653 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 10:15:17 -0400
Subject: Tests: Rename {widget}_defaults.js -> {widget}_common.js

---
 tests/unit/accordion/accordion.html                |  8 ++---
 tests/unit/accordion/accordion_common.js           | 20 +++++++++++++
 .../unit/accordion/accordion_common_deprecated.js  | 29 ++++++++++++++++++
 tests/unit/accordion/accordion_defaults.js         | 20 -------------
 .../accordion/accordion_defaults_deprecated.js     | 29 ------------------
 tests/unit/accordion/accordion_deprecated.html     |  8 ++---
 tests/unit/autocomplete/autocomplete.html          |  2 +-
 tests/unit/autocomplete/autocomplete_common.js     | 25 ++++++++++++++++
 tests/unit/autocomplete/autocomplete_defaults.js   | 25 ----------------
 tests/unit/button/button.html                      |  2 +-
 tests/unit/button/button_common.js                 | 14 +++++++++
 tests/unit/button/button_defaults.js               | 14 ---------
 tests/unit/dialog/dialog.html                      |  2 +-
 tests/unit/dialog/dialog_common.js                 | 34 ++++++++++++++++++++++
 tests/unit/dialog/dialog_defaults.js               | 34 ----------------------
 tests/unit/draggable/draggable.html                |  2 +-
 tests/unit/draggable/draggable_common.js           | 32 ++++++++++++++++++++
 tests/unit/draggable/draggable_defaults.js         | 32 --------------------
 tests/unit/droppable/droppable.html                |  2 +-
 tests/unit/droppable/droppable_common.js           | 12 ++++++++
 tests/unit/droppable/droppable_defaults.js         | 12 --------
 tests/unit/menu/menu.html                          |  2 +-
 tests/unit/menu/menu_common.js                     | 16 ++++++++++
 tests/unit/menu/menu_defaults.js                   | 16 ----------
 tests/unit/progressbar/progressbar.html            |  2 +-
 tests/unit/progressbar/progressbar_common.js       | 10 +++++++
 tests/unit/progressbar/progressbar_defaults.js     | 10 -------
 tests/unit/resizable/resizable.html                |  2 +-
 tests/unit/resizable/resizable_common.js           | 27 +++++++++++++++++
 tests/unit/resizable/resizable_defaults.js         | 27 -----------------
 tests/unit/selectable/selectable.html              |  2 +-
 tests/unit/selectable/selectable_common.js         | 12 ++++++++
 tests/unit/selectable/selectable_defaults.js       | 12 --------
 tests/unit/slider/slider.html                      |  2 +-
 tests/unit/slider/slider_common.js                 | 19 ++++++++++++
 tests/unit/slider/slider_defaults.js               | 19 ------------
 tests/unit/sortable/sortable.html                  |  2 +-
 tests/unit/sortable/sortable_common.js             | 30 +++++++++++++++++++
 tests/unit/sortable/sortable_defaults.js           | 30 -------------------
 tests/unit/spinner/spinner.html                    |  4 +--
 tests/unit/spinner/spinner_common.js               | 19 ++++++++++++
 tests/unit/spinner/spinner_defaults.js             | 19 ------------
 tests/unit/tabs/tabs.html                          |  2 +-
 tests/unit/tabs/tabs_common.js                     | 16 ++++++++++
 tests/unit/tabs/tabs_common_deprecated.js          | 29 ++++++++++++++++++
 tests/unit/tabs/tabs_defaults.js                   | 16 ----------
 tests/unit/tabs/tabs_defaults_deprecated.js        | 29 ------------------
 tests/unit/tabs/tabs_deprecated.html               |  2 +-
 tests/unit/tooltip/tooltip.html                    |  2 +-
 tests/unit/tooltip/tooltip_common.js               | 20 +++++++++++++
 tests/unit/tooltip/tooltip_defaults.js             | 20 -------------
 51 files changed, 388 insertions(+), 388 deletions(-)
 create mode 100644 tests/unit/accordion/accordion_common.js
 create mode 100644 tests/unit/accordion/accordion_common_deprecated.js
 delete mode 100644 tests/unit/accordion/accordion_defaults.js
 delete mode 100644 tests/unit/accordion/accordion_defaults_deprecated.js
 create mode 100644 tests/unit/autocomplete/autocomplete_common.js
 delete mode 100644 tests/unit/autocomplete/autocomplete_defaults.js
 create mode 100644 tests/unit/button/button_common.js
 delete mode 100644 tests/unit/button/button_defaults.js
 create mode 100644 tests/unit/dialog/dialog_common.js
 delete mode 100644 tests/unit/dialog/dialog_defaults.js
 create mode 100644 tests/unit/draggable/draggable_common.js
 delete mode 100644 tests/unit/draggable/draggable_defaults.js
 create mode 100644 tests/unit/droppable/droppable_common.js
 delete mode 100644 tests/unit/droppable/droppable_defaults.js
 create mode 100644 tests/unit/menu/menu_common.js
 delete mode 100644 tests/unit/menu/menu_defaults.js
 create mode 100644 tests/unit/progressbar/progressbar_common.js
 delete mode 100644 tests/unit/progressbar/progressbar_defaults.js
 create mode 100644 tests/unit/resizable/resizable_common.js
 delete mode 100644 tests/unit/resizable/resizable_defaults.js
 create mode 100644 tests/unit/selectable/selectable_common.js
 delete mode 100644 tests/unit/selectable/selectable_defaults.js
 create mode 100644 tests/unit/slider/slider_common.js
 delete mode 100644 tests/unit/slider/slider_defaults.js
 create mode 100644 tests/unit/sortable/sortable_common.js
 delete mode 100644 tests/unit/sortable/sortable_defaults.js
 create mode 100644 tests/unit/spinner/spinner_common.js
 delete mode 100644 tests/unit/spinner/spinner_defaults.js
 create mode 100644 tests/unit/tabs/tabs_common.js
 create mode 100644 tests/unit/tabs/tabs_common_deprecated.js
 delete mode 100644 tests/unit/tabs/tabs_defaults.js
 delete mode 100644 tests/unit/tabs/tabs_defaults_deprecated.js
 create mode 100644 tests/unit/tooltip/tooltip_common.js
 delete mode 100644 tests/unit/tooltip/tooltip_defaults.js

(limited to 'tests/unit')

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index 5c9169ea3..ec7839019 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -26,7 +26,7 @@
 	<script src="../testsuite.js"></script>
 
 	<script src="accordion_test_helpers.js"></script>
-	<script src="accordion_defaults.js"></script>
+	<script src="accordion_common.js"></script>
 	<script src="accordion_core.js"></script>
 	<script src="accordion_events.js"></script>
 	<script src="accordion_methods.js"></script>
@@ -93,7 +93,7 @@
 				<li><a href="?p=1.1.1.3">Amps</a></li>
 				<li><a href="?p=1.1.1.4">Effects</a></li>
 				<li><a href="?p=1.1.1.5">Accessories</a></li>
-			</ul> 
+			</ul>
 		</li>
 		<li>
 			<h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
@@ -105,7 +105,7 @@
 				<li><a href="?p=1.1.2.5">Accessories</a></li>
 				<li><a href="?p=1.1.2.5">Accessories</a></li>
 				<li><a href="?p=1.1.2.5">Accessories</a></li>
-			</ul> 
+			</ul>
 		</li>
 		<li>
 			<h2><a href="?p=1.1.3">Drums</a></h2>
@@ -113,7 +113,7 @@
 				<li><a href="?p=1.1.3.2">Acoustic</a></li>
 				<li><a href="?p=1.1.3.3">Electronic</a></li>
 				<li><a href="?p=1.1.3.6">Accessories</a></li>
-			</ul> 
+			</ul>
 		</li>
 	</ul>
 </div>
diff --git a/tests/unit/accordion/accordion_common.js b/tests/unit/accordion/accordion_common.js
new file mode 100644
index 000000000..ef24cf25e
--- /dev/null
+++ b/tests/unit/accordion/accordion_common.js
@@ -0,0 +1,20 @@
+TestHelpers.commonWidgetTests( "accordion", {
+	defaults: {
+		active: 0,
+		animate: {},
+		collapsible: false,
+		disabled: false,
+		event: "click",
+		header: "> li > :first-child,> :not(li):even",
+		heightStyle: "auto",
+		icons: {
+			"activeHeader": "ui-icon-triangle-1-s",
+			"header": "ui-icon-triangle-1-e"
+		},
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		create: null
+	}
+});
diff --git a/tests/unit/accordion/accordion_common_deprecated.js b/tests/unit/accordion/accordion_common_deprecated.js
new file mode 100644
index 000000000..22d5e1289
--- /dev/null
+++ b/tests/unit/accordion/accordion_common_deprecated.js
@@ -0,0 +1,29 @@
+TestHelpers.commonWidgetTests( "accordion", {
+	defaults: {
+		active: 0,
+		animate: null,
+		animated: "slide",
+		autoHeight: true,
+		clearStyle: false,
+		collapsible: false,
+		disabled: false,
+		event: "click",
+		fillSpace: false,
+		header: "> li > :first-child,> :not(li):even",
+		heightStyle: null,
+		icons: {
+			"activeHeader": null,
+			"header": "ui-icon-triangle-1-e",
+			"headerSelected": "ui-icon-triangle-1-s"
+		},
+		navigation: false,
+		navigationFilter: function() {},
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		change: null,
+		changestart: null,
+		create: null
+	}
+});
diff --git a/tests/unit/accordion/accordion_defaults.js b/tests/unit/accordion/accordion_defaults.js
deleted file mode 100644
index ef24cf25e..000000000
--- a/tests/unit/accordion/accordion_defaults.js
+++ /dev/null
@@ -1,20 +0,0 @@
-TestHelpers.commonWidgetTests( "accordion", {
-	defaults: {
-		active: 0,
-		animate: {},
-		collapsible: false,
-		disabled: false,
-		event: "click",
-		header: "> li > :first-child,> :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			"activeHeader": "ui-icon-triangle-1-s",
-			"header": "ui-icon-triangle-1-e"
-		},
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		create: null
-	}
-});
diff --git a/tests/unit/accordion/accordion_defaults_deprecated.js b/tests/unit/accordion/accordion_defaults_deprecated.js
deleted file mode 100644
index 22d5e1289..000000000
--- a/tests/unit/accordion/accordion_defaults_deprecated.js
+++ /dev/null
@@ -1,29 +0,0 @@
-TestHelpers.commonWidgetTests( "accordion", {
-	defaults: {
-		active: 0,
-		animate: null,
-		animated: "slide",
-		autoHeight: true,
-		clearStyle: false,
-		collapsible: false,
-		disabled: false,
-		event: "click",
-		fillSpace: false,
-		header: "> li > :first-child,> :not(li):even",
-		heightStyle: null,
-		icons: {
-			"activeHeader": null,
-			"header": "ui-icon-triangle-1-e",
-			"headerSelected": "ui-icon-triangle-1-s"
-		},
-		navigation: false,
-		navigationFilter: function() {},
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		change: null,
-		changestart: null,
-		create: null
-	}
-});
diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index 116eb43b5..f3494c6fc 100644
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -23,7 +23,7 @@
 	<script src="../testsuite.js"></script>
 
 	<script src="accordion_test_helpers.js"></script>
-	<script src="accordion_defaults_deprecated.js"></script>
+	<script src="accordion_common_deprecated.js"></script>
 	<script src="accordion_core.js"></script>
 	<script src="accordion_events.js"></script>
 	<script src="accordion_methods.js"></script>
@@ -91,7 +91,7 @@
 				<li><a href="?p=1.1.1.3">Amps</a></li>
 				<li><a href="?p=1.1.1.4">Effects</a></li>
 				<li><a href="?p=1.1.1.5">Accessories</a></li>
-			</ul> 
+			</ul>
 		</li>
 		<li>
 			<h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
@@ -103,7 +103,7 @@
 				<li><a href="?p=1.1.2.5">Accessories</a></li>
 				<li><a href="?p=1.1.2.5">Accessories</a></li>
 				<li><a href="?p=1.1.2.5">Accessories</a></li>
-			</ul> 
+			</ul>
 		</li>
 		<li>
 			<h2><a href="?p=1.1.3">Drums</a></h2>
@@ -111,7 +111,7 @@
 				<li><a href="?p=1.1.3.2">Acoustic</a></li>
 				<li><a href="?p=1.1.3.3">Electronic</a></li>
 				<li><a href="?p=1.1.3.6">Accessories</a></li>
-			</ul> 
+			</ul>
 		</li>
 	</ul>
 </div>
diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index 70d2ecfd1..259def349 100644
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -24,7 +24,7 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
-	<script src="autocomplete_defaults.js"></script>
+	<script src="autocomplete_common.js"></script>
 	<script src="autocomplete_core.js"></script>
 	<script src="autocomplete_events.js"></script>
 	<script src="autocomplete_methods.js"></script>
diff --git a/tests/unit/autocomplete/autocomplete_common.js b/tests/unit/autocomplete/autocomplete_common.js
new file mode 100644
index 000000000..c090ce4df
--- /dev/null
+++ b/tests/unit/autocomplete/autocomplete_common.js
@@ -0,0 +1,25 @@
+TestHelpers.commonWidgetTests( "autocomplete", {
+	defaults: {
+		appendTo: "body",
+		autoFocus: false,
+		delay: 300,
+		disabled: false,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// callbacks
+		change: null,
+		close: null,
+		create: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	}
+});
diff --git a/tests/unit/autocomplete/autocomplete_defaults.js b/tests/unit/autocomplete/autocomplete_defaults.js
deleted file mode 100644
index c090ce4df..000000000
--- a/tests/unit/autocomplete/autocomplete_defaults.js
+++ /dev/null
@@ -1,25 +0,0 @@
-TestHelpers.commonWidgetTests( "autocomplete", {
-	defaults: {
-		appendTo: "body",
-		autoFocus: false,
-		delay: 300,
-		disabled: false,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		create: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	}
-});
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 5ec7e316a..5f27740c4 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -22,8 +22,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="button_common.js"></script>
 	<script src="button_core.js"></script>
-	<script src="button_defaults.js"></script>
 	<script src="button_events.js"></script>
 	<script src="button_methods.js"></script>
 	<script src="button_options.js"></script>
diff --git a/tests/unit/button/button_common.js b/tests/unit/button/button_common.js
new file mode 100644
index 000000000..ef22d3011
--- /dev/null
+++ b/tests/unit/button/button_common.js
@@ -0,0 +1,14 @@
+TestHelpers.commonWidgetTests( "button", {
+	defaults: {
+		disabled: null,
+		icons: {
+			primary: null,
+			secondary: null
+		},
+		label: null,
+		text: true,
+
+		// callbacks
+		create: null
+	}
+});
diff --git a/tests/unit/button/button_defaults.js b/tests/unit/button/button_defaults.js
deleted file mode 100644
index ef22d3011..000000000
--- a/tests/unit/button/button_defaults.js
+++ /dev/null
@@ -1,14 +0,0 @@
-TestHelpers.commonWidgetTests( "button", {
-	defaults: {
-		disabled: null,
-		icons: {
-			primary: null,
-			secondary: null
-		},
-		label: null,
-		text: true,
-
-		// callbacks
-		create: null
-	}
-});
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 94b20a225..1f940400c 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -27,8 +27,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="dialog_common.js"></script>
 	<script src="dialog_core.js"></script>
-	<script src="dialog_defaults.js"></script>
 	<script src="dialog_events.js"></script>
 	<script src="dialog_methods.js"></script>
 	<script src="dialog_options.js"></script>
diff --git a/tests/unit/dialog/dialog_common.js b/tests/unit/dialog/dialog_common.js
new file mode 100644
index 000000000..623908da7
--- /dev/null
+++ b/tests/unit/dialog/dialog_common.js
@@ -0,0 +1,34 @@
+TestHelpers.commonWidgetTests( "dialog", {
+	defaults: {
+		autoOpen: true,
+		buttons: {},
+		closeOnEscape: true,
+		closeText: 'close',
+		disabled: false,
+		dialogClass: '',
+		draggable: true,
+		height: 'auto',
+		hide: null,
+		maxHeight: false,
+		maxWidth: false,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: 'center',
+			at: 'center',
+			of: window,
+			collision: 'fit',
+			using: $.ui.dialog.prototype.options.position.using
+		},
+		resizable: true,
+		show: null,
+		stack: true,
+		title: '',
+		width: 300,
+		zIndex: 1000,
+
+		// callbacks
+		create: null
+	}
+});
diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js
deleted file mode 100644
index 623908da7..000000000
--- a/tests/unit/dialog/dialog_defaults.js
+++ /dev/null
@@ -1,34 +0,0 @@
-TestHelpers.commonWidgetTests( "dialog", {
-	defaults: {
-		autoOpen: true,
-		buttons: {},
-		closeOnEscape: true,
-		closeText: 'close',
-		disabled: false,
-		dialogClass: '',
-		draggable: true,
-		height: 'auto',
-		hide: null,
-		maxHeight: false,
-		maxWidth: false,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: 'center',
-			at: 'center',
-			of: window,
-			collision: 'fit',
-			using: $.ui.dialog.prototype.options.position.using
-		},
-		resizable: true,
-		show: null,
-		stack: true,
-		title: '',
-		width: 300,
-		zIndex: 1000,
-
-		// callbacks
-		create: null
-	}
-});
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index 5be71f460..acc50effe 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -23,8 +23,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="draggable_common.js"></script>
 	<script src="draggable_core.js"></script>
-	<script src="draggable_defaults.js"></script>
 	<script src="draggable_events.js"></script>
 	<script src="draggable_methods.js"></script>
 	<script src="draggable_options.js"></script>
diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js
new file mode 100644
index 000000000..b47b139cd
--- /dev/null
+++ b/tests/unit/draggable/draggable_common.js
@@ -0,0 +1,32 @@
+TestHelpers.commonWidgetTests( "draggable", {
+	defaults: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		cancel: ":input,option",
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false
+	}
+});
diff --git a/tests/unit/draggable/draggable_defaults.js b/tests/unit/draggable/draggable_defaults.js
deleted file mode 100644
index b47b139cd..000000000
--- a/tests/unit/draggable/draggable_defaults.js
+++ /dev/null
@@ -1,32 +0,0 @@
-TestHelpers.commonWidgetTests( "draggable", {
-	defaults: {
-		addClasses: true,
-		appendTo: "parent",
-		axis: false,
-		cancel: ":input,option",
-		connectToSortable: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		delay: 0,
-		disabled: false,
-		distance: 1,
-		grid: false,
-		handle: false,
-		helper: "original",
-		iframeFix: false,
-		opacity: false,
-		refreshPositions: false,
-		revert: false,
-		revertDuration: 500,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		snap: false,
-		snapMode: "both",
-		snapTolerance: 20,
-		stack: false,
-		zIndex: false
-	}
-});
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index abf94f0c7..eb2215763 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -24,8 +24,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="droppable_common.js"></script>
 	<script src="droppable_core.js"></script>
-	<script src="droppable_defaults.js"></script>
 	<script src="droppable_events.js"></script>
 	<script src="droppable_methods.js"></script>
 	<script src="droppable_options.js"></script>
diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js
new file mode 100644
index 000000000..985dba06d
--- /dev/null
+++ b/tests/unit/droppable/droppable_common.js
@@ -0,0 +1,12 @@
+TestHelpers.commonWidgetTests( "droppable", {
+	defaults: {
+		accept: "*",
+		activeClass: false,
+		addClasses: true,
+		disabled: false,
+		greedy: false,
+		hoverClass: false,
+		scope: "default",
+		tolerance: "intersect"
+	}
+});
diff --git a/tests/unit/droppable/droppable_defaults.js b/tests/unit/droppable/droppable_defaults.js
deleted file mode 100644
index 985dba06d..000000000
--- a/tests/unit/droppable/droppable_defaults.js
+++ /dev/null
@@ -1,12 +0,0 @@
-TestHelpers.commonWidgetTests( "droppable", {
-	defaults: {
-		accept: "*",
-		activeClass: false,
-		addClasses: true,
-		disabled: false,
-		greedy: false,
-		hoverClass: false,
-		scope: "default",
-		tolerance: "intersect"
-	}
-});
diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 9a598ec8d..54a2ecaa0 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -23,8 +23,8 @@
 	<script src="../testsuite.js"></script>
 
 	<script src="menu_test_helpers.js"></script>
+	<script src="menu_common.js"></script>
 	<script src="menu_core.js"></script>
-	<script src="menu_defaults.js"></script>
 	<script src="menu_events.js"></script>
 	<script src="menu_methods.js"></script>
 	<script src="menu_options.js"></script>
diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
new file mode 100644
index 000000000..ddcdbebf2
--- /dev/null
+++ b/tests/unit/menu/menu_common.js
@@ -0,0 +1,16 @@
+TestHelpers.commonWidgetTests( "menu", {
+	defaults: {
+		disabled: false,
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+
+		// callbacks
+		blur: null,
+		create: null,
+		focus: null,
+		select: null
+	}
+});
diff --git a/tests/unit/menu/menu_defaults.js b/tests/unit/menu/menu_defaults.js
deleted file mode 100644
index ddcdbebf2..000000000
--- a/tests/unit/menu/menu_defaults.js
+++ /dev/null
@@ -1,16 +0,0 @@
-TestHelpers.commonWidgetTests( "menu", {
-	defaults: {
-		disabled: false,
-		menus: "ul",
-		position: {
-			my: "left top",
-			at: "right top"
-		},
-
-		// callbacks
-		blur: null,
-		create: null,
-		focus: null,
-		select: null
-	}
-});
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index 8b55f5a89..f6156d0bb 100644
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -22,8 +22,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="progressbar_common.js"></script>
 	<script src="progressbar_core.js"></script>
-	<script src="progressbar_defaults.js"></script>
 	<script src="progressbar_events.js"></script>
 	<script src="progressbar_methods.js"></script>
 	<script src="progressbar_options.js"></script>
diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/progressbar_common.js
new file mode 100644
index 000000000..2f97a78bb
--- /dev/null
+++ b/tests/unit/progressbar/progressbar_common.js
@@ -0,0 +1,10 @@
+TestHelpers.commonWidgetTests( "progressbar", {
+	defaults: {
+		disabled: false,
+		value: 0,
+		max: 100,
+
+		//callbacks
+		create: null
+	}
+});
diff --git a/tests/unit/progressbar/progressbar_defaults.js b/tests/unit/progressbar/progressbar_defaults.js
deleted file mode 100644
index 2f97a78bb..000000000
--- a/tests/unit/progressbar/progressbar_defaults.js
+++ /dev/null
@@ -1,10 +0,0 @@
-TestHelpers.commonWidgetTests( "progressbar", {
-	defaults: {
-		disabled: false,
-		value: 0,
-		max: 100,
-
-		//callbacks
-		create: null
-	}
-});
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 4e886d2fd..028087842 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -23,8 +23,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="resizable_common.js"></script>
 	<script src="resizable_core.js"></script>
-	<script src="resizable_defaults.js"></script>
 	<script src="resizable_events.js"></script>
 	<script src="resizable_methods.js"></script>
 	<script src="resizable_options.js"></script>
diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js
new file mode 100644
index 000000000..617cdd2ad
--- /dev/null
+++ b/tests/unit/resizable/resizable_common.js
@@ -0,0 +1,27 @@
+TestHelpers.commonWidgetTests('resizable', {
+	defaults: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: 'slow',
+		animateEasing: 'swing',
+		aspectRatio: false,
+		autoHide: false,
+		cancel: ':input,option',
+		containment: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		ghost: false,
+		grid: false,
+		handles: 'e,s,se',
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 1000,
+
+		// callbacks
+		create: null
+	}
+});
diff --git a/tests/unit/resizable/resizable_defaults.js b/tests/unit/resizable/resizable_defaults.js
deleted file mode 100644
index 617cdd2ad..000000000
--- a/tests/unit/resizable/resizable_defaults.js
+++ /dev/null
@@ -1,27 +0,0 @@
-TestHelpers.commonWidgetTests('resizable', {
-	defaults: {
-		alsoResize: false,
-		animate: false,
-		animateDuration: 'slow',
-		animateEasing: 'swing',
-		aspectRatio: false,
-		autoHide: false,
-		cancel: ':input,option',
-		containment: false,
-		delay: 0,
-		disabled: false,
-		distance: 1,
-		ghost: false,
-		grid: false,
-		handles: 'e,s,se',
-		helper: false,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 10,
-		minWidth: 10,
-		zIndex: 1000,
-
-		// callbacks
-		create: null
-	}
-});
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 4f70e8dd4..af4e6d20e 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -23,8 +23,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="selectable_common.js"></script>
 	<script src="selectable_core.js"></script>
-	<script src="selectable_defaults.js"></script>
 	<script src="selectable_events.js"></script>
 	<script src="selectable_methods.js"></script>
 	<script src="selectable_options.js"></script>
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
new file mode 100644
index 000000000..27714d0ae
--- /dev/null
+++ b/tests/unit/selectable/selectable_common.js
@@ -0,0 +1,12 @@
+TestHelpers.commonWidgetTests('selectable', {
+	defaults: {
+		appendTo: 'body',
+		autoRefresh: true,
+		cancel: ':input,option',
+		delay: 0,
+		disabled: false,
+		distance: 0,
+		filter: '*',
+		tolerance: 'touch'
+	}
+});
diff --git a/tests/unit/selectable/selectable_defaults.js b/tests/unit/selectable/selectable_defaults.js
deleted file mode 100644
index 27714d0ae..000000000
--- a/tests/unit/selectable/selectable_defaults.js
+++ /dev/null
@@ -1,12 +0,0 @@
-TestHelpers.commonWidgetTests('selectable', {
-	defaults: {
-		appendTo: 'body',
-		autoRefresh: true,
-		cancel: ':input,option',
-		delay: 0,
-		disabled: false,
-		distance: 0,
-		filter: '*',
-		tolerance: 'touch'
-	}
-});
diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 60d124b7a..a63196219 100644
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -23,8 +23,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="slider_common.js"></script>
 	<script src="slider_core.js"></script>
-	<script src="slider_defaults.js"></script>
 	<script src="slider_events.js"></script>
 	<script src="slider_methods.js"></script>
 	<script src="slider_options.js"></script>
diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js
new file mode 100644
index 000000000..8a0b347f3
--- /dev/null
+++ b/tests/unit/slider/slider_common.js
@@ -0,0 +1,19 @@
+TestHelpers.commonWidgetTests( "slider", {
+	defaults: {
+		animate: false,
+		cancel: ':input,option',
+		delay: 0,
+		disabled: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: 'horizontal',
+		range: false,
+		step: 1,
+		value: 0,
+		values: null,
+
+		// callbacks
+		create: null
+	}
+});
diff --git a/tests/unit/slider/slider_defaults.js b/tests/unit/slider/slider_defaults.js
deleted file mode 100644
index 8a0b347f3..000000000
--- a/tests/unit/slider/slider_defaults.js
+++ /dev/null
@@ -1,19 +0,0 @@
-TestHelpers.commonWidgetTests( "slider", {
-	defaults: {
-		animate: false,
-		cancel: ':input,option',
-		delay: 0,
-		disabled: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: 'horizontal',
-		range: false,
-		step: 1,
-		value: 0,
-		values: null,
-
-		// callbacks
-		create: null
-	}
-});
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index a20eb7109..4ed4f92ce 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -23,8 +23,8 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
+	<script src="sortable_common.js"></script>
 	<script src="sortable_core.js"></script>
-	<script src="sortable_defaults.js"></script>
 	<script src="sortable_events.js"></script>
 	<script src="sortable_methods.js"></script>
 	<script src="sortable_options.js"></script>
diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js
new file mode 100644
index 000000000..b5fc05a5d
--- /dev/null
+++ b/tests/unit/sortable/sortable_common.js
@@ -0,0 +1,30 @@
+TestHelpers.commonWidgetTests( "sortable", {
+	defaults: {
+		appendTo: "parent",
+		axis: false,
+		cancel: ":input,option",
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		delay: 0,
+		disabled: false,
+		distance: 1,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000
+	}
+});
diff --git a/tests/unit/sortable/sortable_defaults.js b/tests/unit/sortable/sortable_defaults.js
deleted file mode 100644
index b5fc05a5d..000000000
--- a/tests/unit/sortable/sortable_defaults.js
+++ /dev/null
@@ -1,30 +0,0 @@
-TestHelpers.commonWidgetTests( "sortable", {
-	defaults: {
-		appendTo: "parent",
-		axis: false,
-		cancel: ":input,option",
-		connectWith: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		delay: 0,
-		disabled: false,
-		distance: 1,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: "> *",
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000
-	}
-});
diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index 0c01a5f48..e495abe1b 100644
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner Test Suite</title>
-	
+
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
 	<script src="../../../external/globalize.js"></script>
@@ -27,8 +27,8 @@
 	<script src="../testsuite.js"></script>
 
 	<script src="spinner_test_helpers.js"></script>
+	<script src="spinner_common.js"></script>
 	<script src="spinner_core.js"></script>
-	<script src="spinner_defaults.js"></script>
 	<script src="spinner_events.js"></script>
 	<script src="spinner_methods.js"></script>
 	<script src="spinner_options.js"></script>
diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/spinner_common.js
new file mode 100644
index 000000000..4f05b1e63
--- /dev/null
+++ b/tests/unit/spinner/spinner_common.js
@@ -0,0 +1,19 @@
+TestHelpers.commonWidgetTests( "spinner", {
+	defaults: {
+		culture: null,
+		disabled: false,
+		incremental: true,
+		max: null,
+		min: null,
+		numberFormat: null,
+		page: 10,
+		step: 1,
+
+		// callbacks
+		change: null,
+		create: null,
+		spin: null,
+		start: null,
+		stop: null
+	}
+});
diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js
deleted file mode 100644
index 4f05b1e63..000000000
--- a/tests/unit/spinner/spinner_defaults.js
+++ /dev/null
@@ -1,19 +0,0 @@
-TestHelpers.commonWidgetTests( "spinner", {
-	defaults: {
-		culture: null,
-		disabled: false,
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		// callbacks
-		change: null,
-		create: null,
-		spin: null,
-		start: null,
-		stop: null
-	}
-});
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 7f60ad277..a79d30e0e 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -26,7 +26,7 @@
 	<script src="../testsuite.js"></script>
 
 	<script src="tabs_test_helpers.js"></script>
-	<script src="tabs_defaults.js"></script>
+	<script src="tabs_common.js"></script>
 	<script src="tabs_core.js"></script>
 	<script src="tabs_events.js"></script>
 	<script src="tabs_methods.js"></script>
diff --git a/tests/unit/tabs/tabs_common.js b/tests/unit/tabs/tabs_common.js
new file mode 100644
index 000000000..7ffb05da4
--- /dev/null
+++ b/tests/unit/tabs/tabs_common.js
@@ -0,0 +1,16 @@
+TestHelpers.commonWidgetTests( "tabs", {
+	defaults: {
+		active: null,
+		collapsible: false,
+		disabled: false,
+		event: "click",
+		fx: null,
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		create: null,
+		load: null
+	}
+});
diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js
new file mode 100644
index 000000000..fdcff21b3
--- /dev/null
+++ b/tests/unit/tabs/tabs_common_deprecated.js
@@ -0,0 +1,29 @@
+TestHelpers.commonWidgetTests( "tabs", {
+	defaults: {
+		active: null,
+		ajaxOptions: null,
+		cache: false,
+		collapsible: false,
+		cookie: null,
+		disabled: false,
+		event: "click",
+		fx: null,
+		idPrefix: "ui-tabs-",
+		panelTemplate: "<div></div>",
+		spinner: "<em>Loading&#8230;</em>",
+		tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>",
+
+		// callbacks
+		activate: null,
+		add: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		create: null,
+		disable: null,
+		enable: null,
+		load: null,
+		remove: null,
+		select: null,
+		show: null
+	}
+});
diff --git a/tests/unit/tabs/tabs_defaults.js b/tests/unit/tabs/tabs_defaults.js
deleted file mode 100644
index 7ffb05da4..000000000
--- a/tests/unit/tabs/tabs_defaults.js
+++ /dev/null
@@ -1,16 +0,0 @@
-TestHelpers.commonWidgetTests( "tabs", {
-	defaults: {
-		active: null,
-		collapsible: false,
-		disabled: false,
-		event: "click",
-		fx: null,
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		create: null,
-		load: null
-	}
-});
diff --git a/tests/unit/tabs/tabs_defaults_deprecated.js b/tests/unit/tabs/tabs_defaults_deprecated.js
deleted file mode 100644
index fdcff21b3..000000000
--- a/tests/unit/tabs/tabs_defaults_deprecated.js
+++ /dev/null
@@ -1,29 +0,0 @@
-TestHelpers.commonWidgetTests( "tabs", {
-	defaults: {
-		active: null,
-		ajaxOptions: null,
-		cache: false,
-		collapsible: false,
-		cookie: null,
-		disabled: false,
-		event: "click",
-		fx: null,
-		idPrefix: "ui-tabs-",
-		panelTemplate: "<div></div>",
-		spinner: "<em>Loading&#8230;</em>",
-		tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>",
-
-		// callbacks
-		activate: null,
-		add: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		create: null,
-		disable: null,
-		enable: null,
-		load: null,
-		remove: null,
-		select: null,
-		show: null
-	}
-});
diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index c22ec3369..9bb8e413e 100644
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -24,7 +24,7 @@
 	<script src="../testsuite.js"></script>
 
 	<script src="tabs_test_helpers.js"></script>
-	<script src="tabs_defaults_deprecated.js"></script>
+	<script src="tabs_common_deprecated.js"></script>
 	<script src="tabs_core.js"></script>
 	<script src="tabs_events.js"></script>
 	<script src="tabs_methods.js"></script>
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index b5e8558e5..d1f54d544 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -23,7 +23,7 @@
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 
-	<script src="tooltip_defaults.js"></script>
+	<script src="tooltip_common.js"></script>
 	<script src="tooltip_core.js"></script>
 	<script src="tooltip_events.js"></script>
 	<script src="tooltip_methods.js"></script>
diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js
new file mode 100644
index 000000000..d12ee9519
--- /dev/null
+++ b/tests/unit/tooltip/tooltip_common.js
@@ -0,0 +1,20 @@
+TestHelpers.commonWidgetTests( "tooltip", {
+	defaults: {
+		content: function() {},
+		disabled: false,
+		hide: true,
+		items: "[title]",
+		position: {
+			my: "left+15 center",
+			at: "right center",
+			collision: "flipfit flipfit"
+		},
+		show: true,
+		tooltipClass: null,
+
+		// callbacks
+		close: null,
+		create: null,
+		open: null
+	}
+});
diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js
deleted file mode 100644
index d12ee9519..000000000
--- a/tests/unit/tooltip/tooltip_defaults.js
+++ /dev/null
@@ -1,20 +0,0 @@
-TestHelpers.commonWidgetTests( "tooltip", {
-	defaults: {
-		content: function() {},
-		disabled: false,
-		hide: true,
-		items: "[title]",
-		position: {
-			my: "left+15 center",
-			at: "right center",
-			collision: "flipfit flipfit"
-		},
-		show: true,
-		tooltipClass: null,
-
-		// callbacks
-		close: null,
-		create: null,
-		open: null
-	}
-});
-- 
cgit v1.2.3


From b042f8ebd68e21155edb090917051353fe7a0162 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 10:43:01 -0400
Subject: Tests: Moved loadResources to TestHelpers.

---
 tests/resource_loader.js                       | 40 --------------------------
 tests/unit/accordion/accordion.html            | 12 ++++----
 tests/unit/accordion/accordion_deprecated.html | 12 ++++----
 tests/unit/autocomplete/autocomplete.html      | 12 ++++----
 tests/unit/button/button.html                  | 12 ++++----
 tests/unit/core/core.html                      | 12 ++++----
 tests/unit/datepicker/datepicker.html          | 12 ++++----
 tests/unit/dialog/dialog.html                  | 12 ++++----
 tests/unit/draggable/draggable.html            | 12 ++++----
 tests/unit/droppable/droppable.html            | 12 ++++----
 tests/unit/effects/effects.html                | 11 ++++---
 tests/unit/menu/menu.html                      | 12 ++++----
 tests/unit/position/position.html              | 12 ++++----
 tests/unit/position/position_deprecated.html   | 12 ++++----
 tests/unit/progressbar/progressbar.html        | 12 ++++----
 tests/unit/resizable/resizable.html            | 12 ++++----
 tests/unit/selectable/selectable.html          | 12 ++++----
 tests/unit/slider/slider.html                  | 12 ++++----
 tests/unit/sortable/sortable.html              | 12 ++++----
 tests/unit/spinner/spinner.html                | 12 ++++----
 tests/unit/tabs/tabs.html                      | 12 ++++----
 tests/unit/tabs/tabs_deprecated.html           | 12 ++++----
 tests/unit/testsuite.js                        | 39 +++++++++++++++++++------
 tests/unit/tooltip/tooltip.html                | 12 ++++----
 tests/unit/widget/widget.html                  | 12 ++++----
 25 files changed, 145 insertions(+), 209 deletions(-)
 delete mode 100644 tests/resource_loader.js

(limited to 'tests/unit')

diff --git a/tests/resource_loader.js b/tests/resource_loader.js
deleted file mode 100644
index 9a03411a2..000000000
--- a/tests/resource_loader.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function( $ ) {
-
-var parts = document.location.search.slice( 1 ).split( "&" ),
-	length = parts.length,
-	i = 0,
-	current,
-	min;
-
-for ( ; i < length; i++ ) {
-	current = parts[ i ].split( "=" );
-	if ( current[ 0 ] === "min" ) {
-		min = current[ 1 ];
-		break;
-	}
-}
-
-function includeStyle( url ) {
-	document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
-}
-
-function includeScript( url ) {
-	document.write( "<script src='../../../" + url + "'></script>" );
-}
-
-window.loadResources = min ?
-	function() {
-		// TODO: proper include with theme images
-		includeStyle( "dist/jquery-ui.min.css" );
-		includeScript( "dist/jquery-ui.min.js" );
-	} :
-	function( resources ) {
-		$.each( resources.css || [], function( i, resource ) {
-			includeStyle( "themes/base/jquery." + resource + ".css" );
-		});
-		$.each( resources.js || [], function( i, resource ) {
-			includeScript( resource );
-		});
-	};
-
-})( jQuery );
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index ec7839019..b3b7caeae 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -8,9 +8,12 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.accordion" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -20,11 +23,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="accordion_test_helpers.js"></script>
 	<script src="accordion_common.js"></script>
 	<script src="accordion_core.js"></script>
diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index f3494c6fc..dfb9fa90e 100644
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Accordion Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.accordion" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="accordion_test_helpers.js"></script>
 	<script src="accordion_common_deprecated.js"></script>
 	<script src="accordion_core.js"></script>
diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index 259def349..571c62033 100644
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Autocomplete Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.menu", "ui.autocomplete" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -19,11 +22,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="autocomplete_common.js"></script>
 	<script src="autocomplete_core.js"></script>
 	<script src="autocomplete_events.js"></script>
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 5f27740c4..b79ca1dc6 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Button Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.button" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="button_common.js"></script>
 	<script src="button_core.js"></script>
 	<script src="button_events.js"></script>
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 3b1dc1fc8..3baf852bb 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -5,17 +5,15 @@
 	<title>jQuery UI Core Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
-	<script>
-	loadResources({
-		js: [ "ui/jquery.ui.core.js" ]
-	});
-	</script>
-
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
+	<script>
+	TestHelpers.loadResources({
+		js: [ "ui/jquery.ui.core.js" ]
+	});
+	</script>
 
 	<script src="core.js"></script>
 	<script src="selector.js"></script>
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 592db53cc..bfff32d32 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Datepicker Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.datepicker" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -19,11 +22,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="datepicker_core.js"></script>
 	<script src="datepicker_defaults.js"></script>
 	<script src="datepicker_events.js"></script>
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 1f940400c..d804807f2 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -6,9 +6,12 @@
 
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.bgiframe-2.1.2.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.dialog" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -22,11 +25,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="dialog_common.js"></script>
 	<script src="dialog_core.js"></script>
 	<script src="dialog_events.js"></script>
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index acc50effe..09bc191c9 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Draggable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="draggable_common.js"></script>
 	<script src="draggable_core.js"></script>
 	<script src="draggable_events.js"></script>
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index eb2215763..49ebf6beb 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Droppable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -19,11 +22,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="droppable_common.js"></script>
 	<script src="droppable_core.js"></script>
 	<script src="droppable_events.js"></script>
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index 06023c55d..1fd94182d 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -8,9 +8,12 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		js: [
 			"ui/jquery.effects.core.js",
 			"ui/jquery.effects.blind.js",
@@ -30,10 +33,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
 	<script src="effects_core.js"></script>
 	<script src="effects_scale.js"></script>
 
diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 54a2ecaa0..fca45697f 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Menu Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.menu" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="menu_test_helpers.js"></script>
 	<script src="menu_common.js"></script>
 	<script src="menu_core.js"></script>
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 115adc3e9..3ea7750d7 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -8,17 +8,15 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../resource_loader.js"></script>
-	<script>
-	loadResources({
-		js: [ "ui/jquery.ui.position.js" ]
-	});
-	</script>
-
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
+	<script>
+	TestHelpers.loadResources({
+		js: [ "ui/jquery.ui.position.js" ]
+	});
+	</script>
 
 	<script src="position_core.js"></script>
 	<script src="position_core_within.js"></script>
diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index ee9be189d..c7a9b6bce 100644
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -5,17 +5,15 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
-	<script>
-	loadResources({
-		js: [ "ui/jquery.ui.position.js" ]
-	});
-	</script>
-
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
+	<script>
+	TestHelpers.loadResources({
+		js: [ "ui/jquery.ui.position.js" ]
+	});
+	</script>
 
 	<script src="position_core.js"></script>
 	<script src="position_deprecated.js"></script>
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index f6156d0bb..70a4abe56 100644
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Progressbar Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.progressbar" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -17,11 +20,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="progressbar_common.js"></script>
 	<script src="progressbar_core.js"></script>
 	<script src="progressbar_events.js"></script>
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 028087842..9baa67493 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Resizable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.resizable" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="resizable_common.js"></script>
 	<script src="resizable_core.js"></script>
 	<script src="resizable_events.js"></script>
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index af4e6d20e..7b0ca6ffe 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Selectable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.selectable" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="selectable_common.js"></script>
 	<script src="selectable_core.js"></script>
 	<script src="selectable_events.js"></script>
diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index a63196219..3aec78b4b 100644
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Slider Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.slider" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="slider_common.js"></script>
 	<script src="slider_core.js"></script>
 	<script src="slider_events.js"></script>
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index 4ed4f92ce..c84c62197 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Sortable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.sortable" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="sortable_common.js"></script>
 	<script src="sortable_core.js"></script>
 	<script src="sortable_events.js"></script>
diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index e495abe1b..b7f4a532a 100644
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -8,9 +8,12 @@
 	<script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
 	<script src="../../../external/globalize.js"></script>
 	<script src="../../../external/globalize.culture.ja-JP.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.button", "ui.spinner" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -21,11 +24,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="spinner_test_helpers.js"></script>
 	<script src="spinner_common.js"></script>
 	<script src="spinner_core.js"></script>
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index a79d30e0e..fc7bfeedf 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -8,9 +8,12 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.tabs" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -20,11 +23,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="tabs_test_helpers.js"></script>
 	<script src="tabs_common.js"></script>
 	<script src="tabs_core.js"></script>
diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index 9bb8e413e..0c7611c9d 100644
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -6,9 +6,12 @@
 
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.cookie.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.tabs" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="tabs_test_helpers.js"></script>
 	<script src="tabs_common_deprecated.js"></script>
 	<script src="tabs_core.js"></script>
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 70d035684..6720000f1 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -2,12 +2,35 @@
 
 window.TestHelpers = {};
 
+function includeStyle( url ) {
+	document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
+}
+
+function includeScript( url ) {
+	document.write( "<script src='../../../" + url + "'></script>" );
+}
+
+TestHelpers.loadResources = QUnit.urlParams.min ?
+	function() {
+		// TODO: proper include with theme images
+		includeStyle( "dist/jquery-ui.min.css" );
+		includeScript( "dist/jquery-ui.min.js" );
+	} :
+	function( resources ) {
+		$.each( resources.css || [], function( i, resource ) {
+			includeStyle( "themes/base/jquery." + resource + ".css" );
+		});
+		$.each( resources.js || [], function( i, resource ) {
+			includeScript( resource );
+		});
+	};
+
 function testJshint( widget ) {
 	if ( QUnit.urlParams.nojshint ) {
 		return;
 	}
 
-	document.write( "<script src='../../../external/jshint.js'></script>" );
+	includeScript( "external/jshint.js" );
 	asyncTest( "JSHint", function() {
 		expect( 1 );
 
@@ -58,17 +81,15 @@ function testWidgetDefaults( widget, defaults ) {
 	});
 }
 
-var privateMethods = [
-	"_createWidget",
-	"destroy",
-	"option",
-	"_trigger"
-];
-
 function testWidgetOverrides( widget ) {
 	if ( $.uiBackCompat === false ) {
 		test( "$.widget overrides", function() {
-			$.each( privateMethods, function( i, method ) {
+			$.each([
+				"_createWidget",
+				"destroy",
+				"option",
+				"_trigger"
+			], function( i, method ) {
 				strictEqual( $.ui[ widget ].prototype[ method ],
 					$.Widget.prototype[ method ], "should not override " + method );
 			});
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index d1f54d544..d20ba8578 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Tooltip Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.tooltip" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,11 +21,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="tooltip_common.js"></script>
 	<script src="tooltip_core.js"></script>
 	<script src="tooltip_events.js"></script>
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 6f4caaa6c..15eaee6aa 100644
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Widget Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core" ],
 		js: [
 			"ui/jquery.ui.widget.js"
@@ -15,11 +18,6 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
 	<script src="widget_core.js"></script>
 	<script src="widget_extend.js"></script>
 	<script src="widget_animation.js"></script>
-- 
cgit v1.2.3


From 3cb9ab723a23462d5b4e1959db267fd6d147ef40 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 10:47:43 -0400
Subject: Tests: Add custom URL configs to QUnit.config.urlConfig for
 discoverability.

---
 tests/unit/testsuite.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/unit')

diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 6720000f1..7e505979c 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -10,6 +10,7 @@ function includeScript( url ) {
 	document.write( "<script src='../../../" + url + "'></script>" );
 }
 
+QUnit.config.urlConfig.push( "min" );
 TestHelpers.loadResources = QUnit.urlParams.min ?
 	function() {
 		// TODO: proper include with theme images
@@ -25,6 +26,7 @@ TestHelpers.loadResources = QUnit.urlParams.min ?
 		});
 	};
 
+QUnit.config.urlConfig.push( "nojshint" );
 function testJshint( widget ) {
 	if ( QUnit.urlParams.nojshint ) {
 		return;
-- 
cgit v1.2.3


From 15705723b2d170f70c3ef408b5b4dca83c84e586 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 12:23:43 -0400
Subject: Position tests: Removed unused elements.

---
 tests/unit/position/position.html            | 8 --------
 tests/unit/position/position_deprecated.html | 8 --------
 2 files changed, 16 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 3ea7750d7..396e3e13e 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -49,14 +49,6 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 			<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
 		</div>
 
-		<div style="position: absolute; top: 200px; left: 100px;">
-			<div id="el-offset-100-200" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-			<div style="position: absolute; top: 100px; left: 50px;">
-				<div id="el-two-offset-150-300" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-				<div id="el-fixed" style="position: fixed; top: 200px; left: 200px;"></div>
-			</div>
-		</div>
-
 		<div style="position: absolute; height: 5000px; width: 5000px;"></div>
 
 		<div id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;">
diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index c7a9b6bce..2a7769107 100644
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -44,14 +44,6 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 	<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
 </div>
 
-<div style="position: absolute; top: 200px; left: 100px;">
-	<div id="el-offset-100-200" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-	<div style="position: absolute; top: 100px; left: 50px;">
-		<div id="el-two-offset-150-300" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-		<div id="el-fixed" style="position: fixed; top: 200px; left: 200px;"></div>
-	</div>
-</div>
-
 <div style="position: absolute; height: 5000px; width: 5000px;"></div>
 
 <div id="bug-5280" style="height: 30px; width: 201px;">
-- 
cgit v1.2.3


From 22edb7755923d76c5ecd77f973d49b4c9ce68d1f Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Mon, 23 Apr 2012 18:44:17 +0200
Subject: Fix various issues in our html files, second batch

---
 demos/menu/default.html              |   4 +-
 demos/menu/navigationmenu.html       |   2 +-
 demos/menu/topalignmenu.html         |   2 +-
 tests/static/icons.html              |   7 +-
 tests/unit/core/core.html            |  12 +--
 tests/visual/theme.html              | 152 +++++++++++++++++------------------
 tests/visual/tooltip/animations.html |   1 +
 tests/visual/tooltip/tooltip.html    |   1 +
 8 files changed, 92 insertions(+), 89 deletions(-)

(limited to 'tests/unit')

diff --git a/demos/menu/default.html b/demos/menu/default.html
index 9f2e21622..b1c0b9fbb 100644
--- a/demos/menu/default.html
+++ b/demos/menu/default.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8" />
+	<meta charset="utf-8">
 	<title>jQuery UI Menu - Default demo</title>
 	<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
 	<script src="../../jquery-1.7.2.js"></script>
@@ -15,7 +15,7 @@
 	});
 	</script>
 	<style>
-		
+
 	</style>
 </head>
 <body>
diff --git a/demos/menu/navigationmenu.html b/demos/menu/navigationmenu.html
index 970b20890..8c7b2b993 100644
--- a/demos/menu/navigationmenu.html
+++ b/demos/menu/navigationmenu.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8" />
+	<meta charset="utf-8">
 	<title>jQuery UI Menu - Navigation Menu demo</title>
 	<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
 	<script src="../../jquery-1.7.2.js"></script>
diff --git a/demos/menu/topalignmenu.html b/demos/menu/topalignmenu.html
index 42721fe9d..7b7e052e4 100644
--- a/demos/menu/topalignmenu.html
+++ b/demos/menu/topalignmenu.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-	<meta charset="UTF-8" />
+	<meta charset="utf-8">
 	<title>Menu Demo: Top-aligned Menu</title>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
diff --git a/tests/static/icons.html b/tests/static/icons.html
index af2833442..adaf5f1cd 100644
--- a/tests/static/icons.html
+++ b/tests/static/icons.html
@@ -16,12 +16,13 @@
 		ul {margin: 0; padding: 0;}
 		td div {margin: 2px; position: relative; padding: 4px 0; cursor: pointer; float: left;  list-style: none;}
 		span.ui-icon { float: left; margin: 0 4px;}
+		.icon-collection { border-spacing: 0; border-collapse: collapse; }
 	</style>
 
 	<script type="text/javascript">
 	$(function(){
 		$('.ui-state-default').hover(
-			function(){ $(this).addClass('ui-state-hover'); }, 
+			function(){ $(this).addClass('ui-state-hover'); },
 			function(){ $(this).removeClass('ui-state-hover'); }
 		);
 
@@ -36,7 +37,7 @@
 
 <p class="icons"></p>
 
-<table  class="ui-widget icon-collection" cellpaddding="0" cellspacing="0">
+<table  class="ui-widget icon-collection">
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-n"><span class="ui-icon ui-icon-carat-1-n"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-ne"><span class="ui-icon ui-icon-carat-1-ne"></span></div></td>
@@ -238,7 +239,7 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></div></td>
-			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></div></td></ul>
+			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></div></td>
 	</tr>
 </table>
 
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 3baf852bb..0df138873 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -37,15 +37,15 @@
 <ol id="qunit-tests"></ol>
 <div id="qunit-fixture">
 
-<img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10", height="10">
+<img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10" height="10" alt="">
 <map name="mymap">
-	<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref">
-	<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref">
-	<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref">
-	<area href="foo.html" id="areaNoCoordsHref">
+	<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref" alt="">
+	<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref" alt="">
+	<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref" alt="">
+	<area href="foo.html" id="areaNoCoordsHref" alt="">
 </map>
 <map name="mymap2">
-	<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaNoImg">
+	<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaNoImg" alt="">
 </map>
 
 <form id="formNoTabindex"></form>
diff --git a/tests/visual/theme.html b/tests/visual/theme.html
index fe9146169..83e46d97c 100644
--- a/tests/visual/theme.html
+++ b/tests/visual/theme.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<meta charset="utf-8">
 		<title>jQuery UI Example Page</title>
 		<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css">
 		<script type="text/javascript" src="../../jquery-1.7.2.js"></script>
@@ -28,26 +28,26 @@
 				// Accordion
 				$(".accordion").accordion({ header: "h3" });
 				$(".accordion").last().accordion("option", "icons", false);
-				
-				
+
+
 				// Tabs
 				$('#tabs').tabs();
-	
 
-				// Dialog			
+
+				// Dialog
 				$('#dialog').dialog({
 					autoOpen: false,
 					width: 600,
 					buttons: {
-						"Ok": function() { 
-							$(this).dialog("close"); 
-						}, 
-						"Cancel": function() { 
-							$(this).dialog("close"); 
-						} 
+						"Ok": function() {
+							$(this).dialog("close");
+						},
+						"Cancel": function() {
+							$(this).dialog("close");
+						}
 					}
 				});
-				
+
 				// Dialog Link
 				$('#dialog_link').click(function(){
 					$('#dialog').dialog('open');
@@ -59,19 +59,19 @@
 					inline: true,
 					showWeek: true
 				});
-				
+
 				$('#multidatepicker').datepicker({
 					numberOfMonths: 3,
 					showButtonPanel: true,
 					inline: true
 				});
-				
+
 				// Slider
 				$('.slider').slider({
 					range: true,
 					values: [17, 67]
 				});
-				
+
 				$("#eq > span").each(function() {
 					var value = parseInt($(this).text());
 					$(this).empty().slider({
@@ -81,19 +81,19 @@
 						orientation: "vertical"
 					});
 				});
-				
-				
+
+
 				// Progressbar
 				$("#progressbar").progressbar({
-					value: 20 
+					value: 20
 				});
-				
+
 				//hover states on the static widgets
 				$('#dialog_link, ul#icons li').hover(
-					function() { $(this).addClass('ui-state-hover'); }, 
+					function() { $(this).addClass('ui-state-hover'); },
 					function() { $(this).removeClass('ui-state-hover'); }
 				);
-				
+
 				$(".buttonset > button").button()
 				.next()
 				.button({
@@ -104,8 +104,8 @@
 				})
 				.parent()
 				.buttonset();
-				
-				
+
+
 				$('#beginning').button({
 					text: false,
 					icons: {
@@ -144,7 +144,7 @@
 				});
 				$("#shuffle").button();
 				$("#repeat").buttonset();
-				
+
 			});
 		</script>
 		<style type="text/css">
@@ -160,13 +160,13 @@
 			#eq span { 	height:120px; float:left; margin:15px 	}
 			.buttonset {margin-bottom: 5px; }
 			#toolbar { padding: 10px 4px;  }
-		</style>	
+		</style>
 	</head>
 	<body>
 
 	<!-- <p style="font-size: 1.3em; line-height: 1.5; margin: 1em 0; width: 50%;">This page demonstrates the widgets using a theme.</p> -->
 		<div id="switcher" style="position:absolute; right: 20px; top: 20px;"></div>
-		
+
 		<!-- Accordion -->
 		<h2 class="demoHeaders">Accordion</h2>
 		<div class="columnbox">
@@ -201,8 +201,8 @@
 				</div>
 			</div>
 		</div>
-		
-	
+
+
 		<!-- Tabs -->
 		<h2 class="demoHeaders">Tabs</h2>
 		<div id="tabs">
@@ -215,20 +215,20 @@
 			<div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
 			<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
 		</div>
-	
+
 		<!-- Dialog NOTE: Dialog is not generated by UI in this demo so it can be visually styled in themeroller-->
 		<h2 class="demoHeaders">Dialog</h2>
 		<p><a href="#" id="dialog_link" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-newwin"></span>Open Dialog</a></p>
-		
+
 		<div class="ui-dialog ui-widget ui-widget-content ui-corner-all  ui-draggable ui-resizable" ><div class="ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix"><span class="ui-dialog-title">Inline Dialog</span><a href="#" class="ui-dialog-titlebar-close ui-corner-all" ><span class="ui-icon ui-icon-closethick" >close</span></a></div><div class="ui-dialog-content ui-widget-content" >
 		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
 		</div><div class="ui-resizable-handle ui-resizable-n" ></div><div class="ui-resizable-handle ui-resizable-e" ></div><div class="ui-resizable-handle ui-resizable-s" ></div><div class="ui-resizable-handle ui-resizable-w" ></div><div class="ui-resizable-handle ui-resizable-se ui-icon ui-icon-gripsmall-diagonal-se ui-icon-grip-diagonal-se" ></div><div class="ui-resizable-handle ui-resizable-sw" ></div><div class="ui-resizable-handle ui-resizable-ne" ></div><div class="ui-resizable-handle ui-resizable-nw" ></div><div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"><button type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" role="button" aria-disabled="false"><span class="ui-button-text">Ok</span></button><button type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" role="button" aria-disabled="false"><span class="ui-button-text">Cancel</span></button></div></div>
-		
-		
+
+
 		<h2 class="demoHeaders">Overlay and Shadow Classes <em>(not currently used in UI widgets)</em></h2>
 		<div style="position: relative; width: 96%; height: 200px; padding:1% 4%; overflow:hidden;" class="fakewindowcontain">
 			<p>Lorem ipsum dolor sit amet,  Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. </p><p>Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. </p><p>Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. </p><p>Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. </p>
-			
+
 			<!-- ui-dialog -->
 			<div class="ui-overlay"><div class="ui-widget-overlay"></div><div class="ui-widget-shadow ui-corner-all" style="width: 302px; height: 152px; position: absolute; left: 50px; top: 30px;"></div></div>
 			<div style="position: absolute; width: 280px; height: 130px;left: 50px; top: 30px; padding: 10px;" class="ui-widget ui-widget-content ui-corner-all">
@@ -236,24 +236,24 @@
 					<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
 				</div>
 			</div>
-		
+
 		</div>
 
-		
+
 		<!-- ui-dialog -->
 		<div id="dialog" title="Dialog Title">
 			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
 		</div>
-			
-				
-				
+
+
+
 		<h2 class="demoHeaders">Framework Icons (content color preview)</h2>
 		<ul id="icons" class="ui-widget ui-helper-clearfix">
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-n"><span class="ui-icon ui-icon-carat-1-n"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-ne"><span class="ui-icon ui-icon-carat-1-ne"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-e"><span class="ui-icon ui-icon-carat-1-e"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-se"><span class="ui-icon ui-icon-carat-1-se"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-s"><span class="ui-icon ui-icon-carat-1-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-sw"><span class="ui-icon ui-icon-carat-1-sw"></span></li>
@@ -263,7 +263,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-e-w"><span class="ui-icon ui-icon-carat-2-e-w"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-e"><span class="ui-icon ui-icon-triangle-1-e"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-se"><span class="ui-icon ui-icon-triangle-1-se"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-s"><span class="ui-icon ui-icon-triangle-1-s"></span></li>
@@ -273,7 +273,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-ne"><span class="ui-icon ui-icon-arrow-1-ne"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-e"><span class="ui-icon ui-icon-arrow-1-e"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-se"><span class="ui-icon ui-icon-arrow-1-se"></span></li>
@@ -283,7 +283,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-nw"><span class="ui-icon ui-icon-arrow-1-nw"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-n-s"><span class="ui-icon ui-icon-arrow-2-n-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-ne-sw"><span class="ui-icon ui-icon-arrow-2-ne-sw"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-e-w"><span class="ui-icon ui-icon-arrow-2-e-w"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-se-nw"><span class="ui-icon ui-icon-arrow-2-se-nw"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-n"><span class="ui-icon ui-icon-arrowstop-1-n"></span></li>
@@ -293,7 +293,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-n"><span class="ui-icon ui-icon-arrowthick-1-n"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-ne"><span class="ui-icon ui-icon-arrowthick-1-ne"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-e"><span class="ui-icon ui-icon-arrowthick-1-e"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-se"><span class="ui-icon ui-icon-arrowthick-1-se"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-s"><span class="ui-icon ui-icon-arrowthick-1-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-sw"><span class="ui-icon ui-icon-arrowthick-1-sw"></span></li>
@@ -303,7 +303,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-ne-sw"><span class="ui-icon ui-icon-arrowthick-2-ne-sw"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-e-w"><span class="ui-icon ui-icon-arrowthick-2-e-w"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-se-nw"><span class="ui-icon ui-icon-arrowthick-2-se-nw"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-n"><span class="ui-icon ui-icon-arrowthickstop-1-n"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-e"><span class="ui-icon ui-icon-arrowthickstop-1-e"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-s"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span></li>
@@ -313,7 +313,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-e"><span class="ui-icon ui-icon-arrowreturnthick-1-e"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-s"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-w"><span class="ui-icon ui-icon-arrowreturn-1-w"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-n"><span class="ui-icon ui-icon-arrowreturn-1-n"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-e"><span class="ui-icon ui-icon-arrowreturn-1-e"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-s"><span class="ui-icon ui-icon-arrowreturn-1-s"></span></li>
@@ -323,7 +323,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4-diag"><span class="ui-icon ui-icon-arrow-4-diag"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-extlink"><span class="ui-icon ui-icon-extlink"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-newwin"><span class="ui-icon ui-icon-newwin"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-refresh"><span class="ui-icon ui-icon-refresh"></span></li>
@@ -333,7 +333,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-open"><span class="ui-icon ui-icon-folder-open"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-document"><span class="ui-icon ui-icon-document"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-document-b"><span class="ui-icon ui-icon-document-b"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-note"><span class="ui-icon ui-icon-note"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-closed"><span class="ui-icon ui-icon-mail-closed"></span></li>
@@ -343,7 +343,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-person"><span class="ui-icon ui-icon-person"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-print"><span class="ui-icon ui-icon-print"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-trash"><span class="ui-icon ui-icon-trash"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-locked"><span class="ui-icon ui-icon-locked"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-unlocked"><span class="ui-icon ui-icon-unlocked"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-bookmark"><span class="ui-icon ui-icon-bookmark"></span></li>
@@ -353,7 +353,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-calculator"><span class="ui-icon ui-icon-calculator"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-cart"><span class="ui-icon ui-icon-cart"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-pencil"><span class="ui-icon ui-icon-pencil"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-clock"><span class="ui-icon ui-icon-clock"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-disk"><span class="ui-icon ui-icon-disk"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-calendar"><span class="ui-icon ui-icon-calendar"></span></li>
@@ -363,7 +363,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-wrench"><span class="ui-icon ui-icon-wrench"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-gear"><span class="ui-icon ui-icon-gear"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-heart"><span class="ui-icon ui-icon-heart"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-star"><span class="ui-icon ui-icon-star"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-link"><span class="ui-icon ui-icon-link"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-cancel"><span class="ui-icon ui-icon-cancel"></span></li>
@@ -373,7 +373,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-minusthick"><span class="ui-icon ui-icon-minusthick"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-close"><span class="ui-icon ui-icon-close"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-closethick"><span class="ui-icon ui-icon-closethick"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-key"><span class="ui-icon ui-icon-key"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-lightbulb"><span class="ui-icon ui-icon-lightbulb"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-scissors"><span class="ui-icon ui-icon-scissors"></span></li>
@@ -384,7 +384,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-video"><span class="ui-icon ui-icon-video"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-script"><span class="ui-icon ui-icon-script"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-alert"><span class="ui-icon ui-icon-alert"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-info"><span class="ui-icon ui-icon-info"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-notice"><span class="ui-icon ui-icon-notice"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-help"><span class="ui-icon ui-icon-help"></span></li>
@@ -396,7 +396,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-pause"><span class="ui-icon ui-icon-pause"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-next"><span class="ui-icon ui-icon-seek-next"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-prev"><span class="ui-icon ui-icon-seek-prev"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-end"><span class="ui-icon ui-icon-seek-end"></span></li>
@@ -406,7 +406,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-signal-diag"><span class="ui-icon ui-icon-signal-diag"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-signal"><span class="ui-icon ui-icon-signal"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-0"><span class="ui-icon ui-icon-battery-0"></span></li>
@@ -416,7 +416,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-minus"><span class="ui-icon ui-icon-circle-minus"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-close"><span class="ui-icon ui-icon-circle-close"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-e"><span class="ui-icon ui-icon-circle-triangle-e"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-s"><span class="ui-icon ui-icon-circle-triangle-s"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-w"><span class="ui-icon ui-icon-circle-triangle-w"></span></li>
@@ -426,7 +426,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-w"><span class="ui-icon ui-icon-circle-arrow-w"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-n"><span class="ui-icon ui-icon-circle-arrow-n"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></li>
@@ -436,7 +436,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></li>
-		
+
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-horizontal"><span class="ui-icon ui-icon-grip-dotted-horizontal"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></li>
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></li>
@@ -444,7 +444,7 @@
 		<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
 		</ul>
 
-	
+
 		<!-- Slider -->
 		<h2 class="demoHeaders">Slider</h2>
 		<div class="columnbox">
@@ -461,8 +461,8 @@
 				<span>70</span>
 			</div>
 		</div>
-		
-		
+
+
 		<!-- Datepicker -->
 		<h2 class="demoHeaders">Datepicker</h2>
 		<div class="columnbox" style="width: 32%">
@@ -471,35 +471,35 @@
 		<div class="columnbox" style="width: 66%; height: 220px;">
 			<div id="multidatepicker"></div>
 		</div>
-		
-		
+
+
 		<!-- Progressbar -->
-		<h2 class="demoHeaders">Progressbar</h2>	
+		<h2 class="demoHeaders">Progressbar</h2>
 		<div id="progressbar"></div>
-			
+
 		<!-- Highlight / Error -->
 		<h2 class="demoHeaders">Highlight / Error</h2>
 		<div class="ui-widget">
-			<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"> 
+			<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
 				<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
 				<strong>Hey!</strong> Sample ui-state-highlight style.</p>
 			</div>
 		</div>
 		<br/>
 		<div class="ui-widget">
-			<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;"> 
-				<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span> 
+			<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;">
+				<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
 				<strong>Alert:</strong> Sample ui-state-error style.</p>
 			</div>
 		</div>
-	
+
 		<h2 class="demoHeaders">Button</h2>
-		
+
 		<div class="buttonset">
 			<button id="rerun">Run last action</button>
 			<button id="select">Select an action</button>
 		</div>
-	
+
 		<span id="toolbar" class="ui-widget-header ui-corner-all">
 			<button id="beginning">go to beginning</button>
 			<button id="rewind">rewind</button>
@@ -507,18 +507,18 @@
 			<button id="stop">stop</button>
 			<button id="forward">fast forward</button>
 			<button id="end">go to end</button>
-			
+
 			<input type="checkbox" id="shuffle" /><label for="shuffle">Shuffle</label>
-			
+
 			<span id="repeat">
 				<input type="radio" id="repeat0" name="repeat" checked="checked" /><label for="repeat0">No Repeat</label>
 				<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
 				<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
 			</span>
-		</span>	
-			
+		</span>
+
 		<!-- theme switcher -->
-	
+
 	<script src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
 	<script>
 		$('#switcher').themeswitcher();
diff --git a/tests/visual/tooltip/animations.html b/tests/visual/tooltip/animations.html
index 10235b2f9..38ee28f1d 100644
--- a/tests/visual/tooltip/animations.html
+++ b/tests/visual/tooltip/animations.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+	<meta charset="utf-8">
 	<title>Tooltip Visual Test: Default</title>
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html
index 63c756ce0..da811645c 100644
--- a/tests/visual/tooltip/tooltip.html
+++ b/tests/visual/tooltip/tooltip.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+	<meta charset="utf-8">
 	<title>Tooltip Visual Test: Default</title>
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
-- 
cgit v1.2.3


From d40993dcf674b63530998b9c0b4bb0191df7683a Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Mon, 23 Apr 2012 18:55:11 +0200
Subject: Fix various issues in our html files, third batch

---
 tests/static/datepicker/datepicker.html | 26 +++++------
 tests/unit/core/core.html               |  2 -
 tests/unit/core/selector.js             | 76 ++++++++++++++++-----------------
 3 files changed, 49 insertions(+), 55 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/static/datepicker/datepicker.html b/tests/static/datepicker/datepicker.html
index 89be6b1eb..857677cfd 100644
--- a/tests/static/datepicker/datepicker.html
+++ b/tests/static/datepicker/datepicker.html
@@ -90,7 +90,7 @@
 		</tbody>
 	</table>
 </div>
-	
+
 <!-- Datepicker with 1 combined select -->
 <div class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all">
 	<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix ui-corner-all">
@@ -98,7 +98,7 @@
 		<a title="Next" class="ui-datepicker-next ui-corner-all" href="#"><span class="ui-icon ui-icon-circle-triangle-e">Next</span></a>
 		<div class="ui-datepicker-title">
 			<select class="ui-datepicker-month-year">
-				<optgroup name="2007">
+				<optgroup label="2007">
 					<option value="2007_0">January 2007</option>
 					<option value="2007_1">February 2007</option>
 					<option value="2007_2">March 2007</option>
@@ -112,7 +112,7 @@
 					<option value="2007_10">November 2007</option>
 					<option value="2007_11">December 2007</option>
 				</optgroup>
-				<optgroup name="2008">
+				<optgroup label="2008">
 					<option value="2008_0">January 2008</option>
 					<option value="2008_1">February 2008</option>
 					<option value="2008_2">March 2008</option>
@@ -126,7 +126,7 @@
 					<option value="2008_10">November 2008</option>
 					<option selected="selected" value="2008_11">December 2008</option>
 				</optgroup>
-				<optgroup name="2009">
+				<optgroup label="2009">
 					<option value="2009_0">January 2009</option>
 					<option value="2009_1">February 2009</option>
 					<option value="2009_2">March 2009</option>
@@ -140,7 +140,7 @@
 					<option value="2009_10">November 2009</option>
 					<option value="2009_11">December 2009</option>
 				</optgroup>
-				<optgroup name="2010">
+				<optgroup label="2010">
 					<option value="2010_0">January 2010</option>
 					<option value="2010_1">February 2010</option>
 					<option value="2010_2">March 2010</option>
@@ -430,11 +430,11 @@
 				<td class="ui-datepicker-week-end ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"></td>
 			</tr>
 		</tbody>
-	</table>		
+	</table>
 	<div class="ui-datepicker-buttonpane ui-widget-content">
 		<button class="ui-state-default ui-priority-primary ui-corner-all">Done</button>
 		<button class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all">Today</button>
-	</div> 
+	</div>
 </div>
 
 <!-- Multiple Datepickers with read only month/year -->
@@ -649,7 +649,7 @@
 				</td></tr>
 			</tbody>
 		</table>
-	</div>	
+	</div>
 	<div class="ui-datepicker-group ui-datepicker-group-middle">
 		<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
 			<div class="ui-datepicker-title">
@@ -863,7 +863,7 @@
 				</td></tr>
 			</tbody>
 		</table>
-	</div>	
+	</div>
 	<div class="ui-datepicker-group ui-datepicker-group-middle">
 		<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
 			<div class="ui-datepicker-title">
@@ -924,7 +924,7 @@
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">23</a></td>
 					<td class=""><a href="#" class="ui-state-default">24</a></td>
 					<td class=""><a href="#" class="ui-state-default">25</a></td>
-					<td class=""><a href="#" class="ui-state-default">26</a></td>					
+					<td class=""><a href="#" class="ui-state-default">26</a></td>
 					<td class=""><a href="#" class="ui-state-default">27</a></td>
 					<td class=""><a href="#" class="ui-state-default">28</a></td>
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">29</a></td>
@@ -1077,8 +1077,8 @@
 				</td></tr>
 			</tbody>
 		</table>
-	</div>	
-	
+	</div>
+
 	<div class="ui-datepicker-row-break"></div>
 	<div class="ui-datepicker-group ui-datepicker-group-first">
 		<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
@@ -1344,7 +1344,7 @@
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">23</a></td>
 					<td class=""><a href="#" class="ui-state-default">24</a></td>
 					<td class=""><a href="#" class="ui-state-default">25</a></td>
-					<td class=""><a href="#" class="ui-state-default">26</a></td>					
+					<td class=""><a href="#" class="ui-state-default">26</a></td>
 					<td class=""><a href="#" class="ui-state-default">27</a></td>
 					<td class=""><a href="#" class="ui-state-default">28</a></td>
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">29</a></td>
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 0df138873..272b15d2c 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -39,9 +39,7 @@
 
 <img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10" height="10" alt="">
 <map name="mymap">
-	<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref" alt="">
 	<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref" alt="">
-	<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref" alt="">
 	<area href="foo.html" id="areaNoCoordsHref" alt="">
 </map>
 <map name="mymap2">
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
index 2fb78025c..4309289c9 100644
--- a/tests/unit/core/selector.js
+++ b/tests/unit/core/selector.js
@@ -6,24 +6,24 @@
 module("core - selectors");
 
 function isFocusable(selector, msg) {
-	ok($(selector).is(':focusable'), msg + " - selector " + selector + " is focusable");
+	QUnit.push($(selector).is(':focusable'), null, null, msg + " - selector " + selector + " is focusable");
 }
 
 function isNotFocusable(selector, msg) {
-	ok($(selector).length && !$(selector).is(':focusable'), msg + " - selector " + selector + " is not focusable");
+	QUnit.push($(selector).length && !$(selector).is(':focusable'), null, null, msg + " - selector " + selector + " is not focusable");
 }
 
 function isTabbable(selector, msg) {
-	ok($(selector).is(':tabbable'), msg + " - selector " + selector + " is tabbable");
+	QUnit.push($(selector).is(':tabbable'), null, null, msg + " - selector " + selector + " is tabbable");
 }
 
 function isNotTabbable(selector, msg) {
-	ok($(selector).length && !$(selector).is(':tabbable'), msg + " - selector " + selector + " is not tabbable");
+	QUnit.push($(selector).length && !$(selector).is(':tabbable'), null, null, msg + " - selector " + selector + " is not tabbable");
 }
 
 test("data", function() {
 	expect(15);
-	
+
 	var el;
 	function shouldHaveData(msg) {
 		ok(el.is(':data(test)'), msg);
@@ -31,56 +31,56 @@ test("data", function() {
 	function shouldNotHaveData(msg) {
 		ok(!el.is(':data(test)'), msg);
 	}
-	
+
 	el = $('<div>');
 	shouldNotHaveData('data never set');
-	
+
 	el = $('<div>').data('test', null);
 	shouldNotHaveData('data is null');
-	
+
 	el = $('<div>').data('test', true);
 	shouldHaveData('data set to true');
-	
+
 	el = $('<div>').data('test', false);
 	shouldNotHaveData('data set to false');
-	
+
 	el = $('<div>').data('test', 0);
 	shouldNotHaveData('data set to 0');
-	
+
 	el = $('<div>').data('test', 1);
 	shouldHaveData('data set to 1');
-	
+
 	el = $('<div>').data('test', '');
 	shouldNotHaveData('data set to empty string');
-	
+
 	el = $('<div>').data('test', 'foo');
 	shouldHaveData('data set to string');
-	
+
 	el = $('<div>').data('test', []);
 	shouldHaveData('data set to empty array');
-	
+
 	el = $('<div>').data('test', [1]);
 	shouldHaveData('data set to array');
-	
+
 	el = $('<div>').data('test', {});
 	shouldHaveData('data set to empty object');
-	
+
 	el = $('<div>').data('test', {foo: 'bar'});
 	shouldHaveData('data set to object');
-	
+
 	el = $('<div>').data('test', new Date());
 	shouldHaveData('data set to date');
-	
+
 	el = $('<div>').data('test', /test/);
 	shouldHaveData('data set to regexp');
-	
+
 	el = $('<div>').data('test', function() {});
 	shouldHaveData('data set to function');
 });
 
 test("focusable - visible, enabled elements", function() {
 	expect(18);
-	
+
 	isNotFocusable('#formNoTabindex', 'form');
 	isFocusable('#formTabindex', 'form with tabindex');
 	isFocusable('#visibleAncestor-inputTypeNone', 'input, no type');
@@ -103,7 +103,7 @@ test("focusable - visible, enabled elements", function() {
 
 test("focusable - disabled elements", function() {
 	expect(9);
-	
+
 	isNotFocusable('#disabledElement-inputTypeNone', 'input, no type');
 	isNotFocusable('#disabledElement-inputTypeText', 'input, type text');
 	isNotFocusable('#disabledElement-inputTypeCheckbox', 'input, type checkbox');
@@ -117,23 +117,23 @@ test("focusable - disabled elements", function() {
 
 test("focusable - hidden styles", function() {
 	expect(8);
-	
+
 	isNotFocusable('#displayNoneAncestor-input', 'input, display: none parent');
 	isNotFocusable('#displayNoneAncestor-span', 'span with tabindex, display: none parent');
-	
+
 	isNotFocusable('#visibilityHiddenAncestor-input', 'input, visibility: hidden parent');
 	isNotFocusable('#visibilityHiddenAncestor-span', 'span with tabindex, visibility: hidden parent');
-	
+
 	isNotFocusable('#displayNone-input', 'input, display: none');
 	isNotFocusable('#visibilityHidden-input', 'input, visibility: hidden');
-	
+
 	isNotFocusable('#displayNone-span', 'span with tabindex, display: none');
 	isNotFocusable('#visibilityHidden-span', 'span with tabindex, visibility: hidden');
 });
 
 test("focusable - natively focusable with various tabindex", function() {
 	expect(4);
-	
+
 	isFocusable('#inputTabindex0', 'input, tabindex 0');
 	isFocusable('#inputTabindex10', 'input, tabindex 10');
 	isFocusable('#inputTabindex-1', 'input, tabindex -1');
@@ -142,7 +142,7 @@ test("focusable - natively focusable with various tabindex", function() {
 
 test("focusable - not natively focusable with various tabindex", function() {
 	expect(4);
-	
+
 	isFocusable('#spanTabindex0', 'span, tabindex 0');
 	isFocusable('#spanTabindex10', 'span, tabindex 10');
 	isFocusable('#spanTabindex-1', 'span, tabindex -1');
@@ -150,16 +150,14 @@ test("focusable - not natively focusable with various tabindex", function() {
 });
 
 test("focusable - area elements", function() {
-	isNotFocusable('#areaCoordsNoHref', 'coords but no href');
 	isFocusable('#areaCoordsHref', 'coords and href');
-	isFocusable('#areaCoordsNoSizeHref', 'coords of zero px and href');
 	isFocusable('#areaNoCoordsHref', 'href but no coords');
 	isNotFocusable('#areaNoImg', 'not associated with an image');
 });
 
 test("tabbable - visible, enabled elements", function() {
 	expect(18);
-	
+
 	isNotTabbable('#formNoTabindex', 'form');
 	isTabbable('#formTabindex', 'form with tabindex');
 	isTabbable('#visibleAncestor-inputTypeNone', 'input, no type');
@@ -182,7 +180,7 @@ test("tabbable - visible, enabled elements", function() {
 
 test("tabbable - disabled elements", function() {
 	expect(9);
-	
+
 	isNotTabbable('#disabledElement-inputTypeNone', 'input, no type');
 	isNotTabbable('#disabledElement-inputTypeText', 'input, type text');
 	isNotTabbable('#disabledElement-inputTypeCheckbox', 'input, type checkbox');
@@ -196,23 +194,23 @@ test("tabbable - disabled elements", function() {
 
 test("tabbable - hidden styles", function() {
 	expect(8);
-	
+
 	isNotTabbable('#displayNoneAncestor-input', 'input, display: none parent');
 	isNotTabbable('#displayNoneAncestor-span', 'span with tabindex, display: none parent');
-	
+
 	isNotTabbable('#visibilityHiddenAncestor-input', 'input, visibility: hidden parent');
 	isNotTabbable('#visibilityHiddenAncestor-span', 'span with tabindex, visibility: hidden parent');
-	
+
 	isNotTabbable('#displayNone-input', 'input, display: none');
 	isNotTabbable('#visibilityHidden-input', 'input, visibility: hidden');
-	
+
 	isNotTabbable('#displayNone-span', 'span with tabindex, display: none');
 	isNotTabbable('#visibilityHidden-span', 'span with tabindex, visibility: hidden');
 });
 
 test("tabbable -  natively tabbable with various tabindex", function() {
 	expect(4);
-	
+
 	isTabbable('#inputTabindex0', 'input, tabindex 0');
 	isTabbable('#inputTabindex10', 'input, tabindex 10');
 	isNotTabbable('#inputTabindex-1', 'input, tabindex -1');
@@ -221,7 +219,7 @@ test("tabbable -  natively tabbable with various tabindex", function() {
 
 test("tabbable -  not natively tabbable with various tabindex", function() {
 	expect(4);
-	
+
 	isTabbable('#spanTabindex0', 'span, tabindex 0');
 	isTabbable('#spanTabindex10', 'span, tabindex 10');
 	isNotTabbable('#spanTabindex-1', 'span, tabindex -1');
@@ -229,9 +227,7 @@ test("tabbable -  not natively tabbable with various tabindex", function() {
 });
 
 test("tabbable - area elements", function() {
-	isNotTabbable('#areaCoordsNoHref', 'coords but no href');
 	isTabbable('#areaCoordsHref', 'coords and href');
-	isTabbable('#areaCoordsNoSizeHref', 'coords of zero px and href');
 	isTabbable('#areaNoCoordsHref', 'href but no coords');
 	isNotTabbable('#areaNoImg', 'not associated with an image');
 });
-- 
cgit v1.2.3


From b093b6f6f74e20f37689cc9a9447e2f2ae75c2f0 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 15:52:06 -0400
Subject: Position tests: Simplify logic and reduce tests.

---
 tests/unit/position/position.html            |  26 +-
 tests/unit/position/position_core.js         | 395 ++++++++++----------
 tests/unit/position/position_core_within.js  | 540 ---------------------------
 tests/unit/position/position_deprecated.html |  25 +-
 4 files changed, 224 insertions(+), 762 deletions(-)
 delete mode 100644 tests/unit/position/position_core_within.js

(limited to 'tests/unit')

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 396e3e13e..518e1f960 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -19,7 +19,6 @@
 	</script>
 
 	<script src="position_core.js"></script>
-	<script src="position_core_within.js"></script>
 
 	<script src="../swarminject.js"></script>
 </head>
@@ -39,21 +38,20 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 -->
 
 <div id="qunit-fixture" style="top: 0; left: 0; z-index:1">
-	<div id="within-container">
-		<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
-		<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
-		<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
-
-		<div style="position: absolute; top: 0px; left: 0px">
-			<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-			<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
-		</div>
+	<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
+	<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
+	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
+	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px;"></div>
+
+	<div style="position: absolute; top: 0px; left: 0px">
+		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
+		<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
+	</div>
 
-		<div style="position: absolute; height: 5000px; width: 5000px;"></div>
+	<div style="position: absolute; height: 5000px; width: 5000px;"></div>
 
-		<div id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;">
-			<div id="fractions-element"></div>
-		</div>
+	<div id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;">
+		<div id="fractions-element"></div>
 	</div>
 
 	<div id="bug-5280" style="height: 30px; width: 201px;">
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index 5c86e7887..7a9a35132 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -1,13 +1,24 @@
 (function( $ ) {
 
-function scrollTopSupport() {
-	$( window ).scrollTop( 1 );
-	return $( window ).scrollTop() === 1;
-}
-
-module( "position" );
+var win = $( window ),
+	scrollTopSupport = function() {
+		var support = win.scrollTop( 1 ).scrollTop() === 1;
+		win.scrollTop( 0 );
+		scrollTopSupport = function() {
+			return support;
+		};
+		return support;
+	};
+
+module( "position", {
+	setup: function() {
+		win.scrollTop( 0 ).scrollLeft( 0 );
+	}
+});
 
 test( "my, at, of", function() {
+	expect( 4 );
+
 	$( "#elx" ).position({
 		my: "left top",
 		at: "left top",
@@ -42,6 +53,8 @@ test( "my, at, of", function() {
 });
 
 test( "multiple elements", function() {
+	expect( 3 );
+
 	var elements = $( "#el1, #el2" ),
 		result = elements.position({
 			my: "left top",
@@ -58,8 +71,9 @@ test( "multiple elements", function() {
 });
 
 test( "positions", function() {
-	var definitions = [],
-		offsets = {
+	expect( 18 );
+
+	var offsets = {
 			left: 0,
 			center: 3,
 			right: 6,
@@ -68,33 +82,32 @@ test( "positions", function() {
 		},
 		start = { left: 4, top: 4 },
 		el = $( "#el1" );
+
 	$.each( [ 0, 1 ], function( my ) {
 		$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
 			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
-				definitions.push({
-					my: my ? horizontal + " " + vertical : "left top",
-					at: !my ? horizontal + " " + vertical : "left top",
-					result: {
-						top: my ? start.top - offsets[ vertical ] : start.top + offsets[ vertical ],
-						left: my ? start.left - offsets[ horizontal ] : start.left + offsets[ horizontal ]
-					}
+				var _my = my ? horizontal + " " + vertical : "left top",
+					_at = !my ? horizontal + " " + vertical : "left top";
+				el.position({
+					my: _my,
+					at: _at,
+					of: "#parent",
+					collision: "none"
 				});
+				deepEqual( el.offset(), {
+					top: start.top + offsets[ vertical ] * (my ? -1 : 1),
+					left: start.left + offsets[ horizontal ] * (my ? -1 : 1)
+				}, "Position via " + QUnit.jsDump.parse({ my: _my, at: _at }) );
 			});
 		});
 	});
-	$.each( definitions, function( index, definition ) {
-		el.position({
-			my: definition.my,
-			at: definition.at,
-			of: "#parent",
-			collision: "none"
-		});
-		deepEqual( el.offset(), definition.result,
-			"Position via " + QUnit.jsDump.parse({ my:definition.my, at:definition.at }) );
-	});
 });
 
 test( "of", function() {
+	expect( 9 + (scrollTopSupport() ? 1 : 0) );
+
+	var event;
+
 	$( "#elx" ).position({
 		my: "left top",
 		at: "left top",
@@ -141,7 +154,7 @@ test( "of", function() {
 		left: $( document ).width() - 10
 	}, "document as jQuery object" );
 
-	$( window ).scrollTop( 0 );
+	win.scrollTop( 0 );
 
 	$( "#elx" ).position({
 		my: "right bottom",
@@ -150,23 +163,23 @@ test( "of", function() {
 		collision: "none"
 	});
 	deepEqual( $( "#elx" ).offset(), {
-		top: $( window ).height() - 10,
-		left: $( window ).width() - 10
+		top: win.height() - 10,
+		left: win.width() - 10
 	}, "window" );
 
 	$( "#elx" ).position({
 		my: "right bottom",
 		at: "right bottom",
-		of: $( window ),
+		of: win,
 		collision: "none"
 	});
 	deepEqual( $( "#elx" ).offset(), {
-		top: $( window ).height() - 10,
-		left: $( window ).width() - 10
+		top: win.height() - 10,
+		left: win.width() - 10
 	}, "window as jQuery object" );
 
 	if ( scrollTopSupport() ) {
-		$( window ).scrollTop( 500 ).scrollLeft( 200 );
+		win.scrollTop( 500 ).scrollLeft( 200 );
 		$( "#elx" ).position({
 			my: "right bottom",
 			at: "right bottom",
@@ -174,13 +187,13 @@ test( "of", function() {
 			collision: "none"
 		});
 		deepEqual( $( "#elx" ).offset(), {
-			top: $( window ).height() + 500 - 10,
-			left: $( window ).width() + 200 - 10
+			top: win.height() + 500 - 10,
+			left: win.width() + 200 - 10
 		}, "window, scrolled" );
-		$( window ).scrollTop( 0 ).scrollLeft( 0 );
+		win.scrollTop( 0 ).scrollLeft( 0 );
 	}
 
-	var event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
+	event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
 	$( "#elx" ).position({
 		my: "left top",
 		at: "left top",
@@ -206,6 +219,8 @@ test( "of", function() {
 });
 
 test( "offsets", function() {
+	expect( 4 );
+
 	$( "#elx" ).position({
 		my: "left top",
 		at: "left+10 bottom+10",
@@ -272,7 +287,7 @@ function collisionTest( config, result, msg ) {
 	var elem = $( "#elx" ).position( $.extend({
 		my: "left top",
 		at: "right bottom",
-		of: window
+		of: "#parent"
 	}, config ) );
 	deepEqual( elem.offset(), result, msg );
 }
@@ -284,239 +299,225 @@ function collisionTest2( config, result, msg ) {
 	}, config ), result, msg );
 }
 
-test( "collision: fit, no offset", function() {
-	collisionTest({
-		collision: "fit"
-	}, { top: $( window ).height() - 10, left: $( window ).width() - 10 }, "right bottom" );
+test( "collision: fit, no collision", function() {
+	expect( 2 );
 
-	collisionTest2({
+	collisionTest({
 		collision: "fit"
-	}, { top: 0, left: 0 }, "left top" );
-});
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
 
-test( "collision: fit, with offset", function() {
 	collisionTest({
-		collision: "fit",
+		collition: "fit",
 		at: "right+2 bottom+3"
-	}, { top: $(window).height() - 10, left: $(window).width() - 10 }, "right bottom");
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: fit, collision", function() {
+	expect( 2 + (scrollTopSupport() ? 1 : 0) );
 
 	collisionTest2({
-		collision: "fit",
-		at: "left+2 top+3"
-	}, { top: 0, left: 0 }, "left top, positive offset" );
+		collision: "fit"
+	}, {
+		top: 0,
+		left: 0
+	}, "no offset" );
 
 	collisionTest2({
 		collision: "fit",
-		at: "left-2 top-3"
-	}, { top: 0, left: 0 }, "left top, negative offset" );
-});
+		at: "left+2 top+3"
+	}, {
+		top: 0,
+		left: 0
+	}, "with offset" );
 
-test( "collision: fit, window scrolled", function() {
 	if ( scrollTopSupport() ) {
-		var win = $( window );
 		win.scrollTop( 300 ).scrollLeft( 200 );
-
 		collisionTest({
-			collision: "fit",
-			at: "left-100 top-100"
-		}, { top: 300, left: 200 }, "top left" );
-		collisionTest2({
-			collision: "fit",
-			at: "right+100 bottom+100"
-		}, { top: 300 + win.height() - 10, left: 200 + win.width() - 10 }, "right bottom" );
+			collision: "fit"
+		}, {
+			top: 300,
+			left: 200
+		}, "window scrolled" );
 
 		win.scrollTop( 0 ).scrollLeft( 0 );
 	}
 });
 
-test( "collision: flip, no offset", function() {
-	collisionTest({
-		collision: "flip"
-	}, { top: $( window ).height(), left: $( window ).width() }, "left top" );
+test( "collision: flip, no collision", function() {
+	expect( 2 );
 
-	collisionTest2({
+	collisionTest({
 		collision: "flip"
-	}, { top: -10, left: -10 }, "right bottom" );
-});
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
 
-test( "collision: flip, with offset", function() {
 	collisionTest({
 		collision: "flip",
 		at: "right+2 bottom+3"
-	}, { top: $( window ).height() + 3, left: $( window ).width() + 2 }, "left top, with offset added" );
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: flip, collision", function() {
+	expect( 2 );
 
 	collisionTest2({
-		collision: "flip",
-		at: "left+2 top+3"
-	}, { top: -7, left: -8 }, "bottom, positive offset" );
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
 
 	collisionTest2({
 		collision: "flip",
-		at: "left-2 top-3"
-	}, { top: -13, left: -12 }, "right bottom, negative offset" );
+		at: "left+2 top+3"
+	}, {
+		top: 7,
+		left: 8
+	}, "with offset" );
 });
 
-test( "collision: none, no offset", function() {
-	collisionTest({
-		collision: "none"
-	}, { top: $( window ).height(), left: $( window ).width() }, "left top" );
+test( "collision: none, no collision", function() {
+	expect( 2 );
 
-	collisionTest2({
+	collisionTest({
 		collision: "none"
-	}, { top: -10, left: -10 }, "moved to the right bottom" );
-});
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
 
-test( "collision: none, with offset", function() {
 	collisionTest({
 		collision: "none",
 		at: "right+2 bottom+3"
-	}, { top: $( window ).height() + 3, left: $( window ).width() + 2 }, "right bottom, with offset added" );
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: none, collision", function() {
+	expect( 2 );
 
 	collisionTest2({
-		collision: "none",
-		at: "left+2 top+3"
-	}, { top: -7, left: -8 }, "left top, positive offset" );
+		collision: "none"
+	}, {
+		top: -6,
+		left: -6
+	}, "no offset" );
 
 	collisionTest2({
 		collision: "none",
-		at: "left-2 top-3"
-	}, { top: -13, left: -12 }, "left top, negative offset" );
+		at: "left+2 top+3"
+	}, {
+		top: -3,
+		left: -4
+	}, "with offset" );
 });
 
 test( "collision: fit, with margin", function() {
-	$( "#elx" ).css( "margin", 10 );
-
-	collisionTest({
-		collision: "fit"
-	}, { top: $( window ).height() - 20, left: $( window ).width() - 20 }, "right bottom" );
-
-	collisionTest2({
-		collision: "fit"
-	}, { top: 10, left: 10 }, "left top" );
+	expect( 2 );
 
 	$( "#elx" ).css({
-		"margin-left": 5,
-		"margin-top": 5
+		marginTop: 6,
+		marginLeft: 4
 	});
 
 	collisionTest({
 		collision: "fit"
-	}, { top: $( window ).height() - 20, left: $( window ).width() - 20 }, "right bottom" );
+	}, {
+		top: 10,
+		left: 10
+	}, "right bottom" );
 
 	collisionTest2({
 		collision: "fit"
-	}, { top: 5, left: 5 }, "left top" );
+	}, {
+		top: 6,
+		left: 4
+	}, "left top" );
+});
+
+test( "collision: flip, with margin", function() {
+	expect( 3 );
 
 	$( "#elx" ).css({
-		"margin-right": 15,
-		"margin-bottom": 15
+		marginTop: 6,
+		marginLeft: 4
 	});
 
 	collisionTest({
-		collision: "fit"
-	}, { top: $( window ).height() - 25, left: $( window ).width() - 25 }, "right bottom" );
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "left top" );
 
 	collisionTest2({
-		collision: "fit"
-	}, { top: 5, left: 5 }, "left top" );
-});
-
-test( "collision: flip, with margin", function() {
-	$( "#elx" ).css( "margin", 10 );
-
-	collisionTest({
-		collision: "flip",
-		at: "left top"
-	}, { top: 0, left: 0 }, "left top" );
+		collision: "flip"
+	}, {
+		top: 10,
+		left: 10
+	}, "right bottom" );
 
 	collisionTest2({
 		collision: "flip",
-		at: "right bottom"
-	}, { top: $( window ).height() - 10, left: $( window ).width() - 10 }, "right bottom" );
-});
-
-test( "addClass: flipped left", function() {
-	var elem = $( "#elx" ).position( {
-		my: "left center",
-		of: window,
-		collision: "flip",
-		at: "right center"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
-
-	elem.position({
-		my: "right center",
-		of: window,
-		collision: "flip",
-		at: "left center"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Removed ui-flipped-left class' );
-});
-
-test( "addClass: flipped top", function() {
-	var elem = $( "#elx" ).position( {
-		my: "left top",
-		of: window,
-		collision: "flip",
-		at: "right bottom"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-top' ), false, 'Has ui-flipped-top class' );
-
-	elem.position( {
-		my: "left bottom",
-		of: window,
-		collision: "flip",
-		at: "right top"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-top' ), false, 'Removed ui-flipped-top class' );
+		my: "left top"
+	}, {
+		top: 0,
+		left: 4
+	}, "right bottom" );
 });
 
-test( "addClass: flipped right", function() {
-	var elem = $( "#elx" ).position( {
-		my: "right center",
-		of: window,
-		collision: "flip",
-		at: "left center"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-right' ), false, 'Has ui-flipped-right class' );
-
-	elem.position( {
-		my: "left center",
-		of: window,
-		collision: "flip",
-		at: "right center"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-right' ), false, 'Removed ui-flipped-right class' );
+test( "within", function() {
+	expect( 4 );
 
-});
-
-test( "addClass: flipped bottom", function() {
-	var elem = $( "#elx" ).position( {
-		my: "left bottom",
-		of: window,
-		collision: "flip",
-		at: "right top"
-	});
+	collisionTest({
+		within: "#within",
+		collision: "fit"
+	}, {
+		top: 4,
+		left: 2
+	}, "fit - right bottom" );
 
-	deepEqual( elem.hasClass( 'ui-flipped-bottom' ), false, 'Has ui-flipped-bottom class' );
+	collisionTest2({
+		within: "#within",
+		collision: "fit"
+	}, {
+		top: 2,
+		left: 0
+	}, "fit - left top" );
 
-	elem.position( {
-		my: "left top",
-		of: window,
-		collision: "flip",
-		at: "right bottom"
-	});
+	collisionTest({
+		within: "#within",
+		collision: "flip"
+	}, {
+		top: 10,
+		left: -6
+	}, "fit - right bottom" );
 
-	deepEqual( elem.hasClass( 'ui-flipped-bottom' ), false, 'Removed ui-flipped-bottom class' );
+	collisionTest2({
+		within: "#within",
+		collision: "flip"
+	}, {
+		top: 10,
+		left: -6
+	}, "fit - left top" );
 });
 
 test( "fractions", function() {
+	expect( 1 );
+
 	$( "#fractions-element" ).position({
 		my: "left top",
 		at: "left top",
@@ -527,6 +528,8 @@ test( "fractions", function() {
 });
 
 test( "bug #5280: consistent results (avoid fractional values)", function() {
+	expect( 1 );
+
 	var wrapper = $( "#bug-5280" ),
 		elem = wrapper.children(),
 		offset1 = elem.position({
diff --git a/tests/unit/position/position_core_within.js b/tests/unit/position/position_core_within.js
deleted file mode 100644
index 187408c61..000000000
--- a/tests/unit/position/position_core_within.js
+++ /dev/null
@@ -1,540 +0,0 @@
-(function( $ ) {
-
-function scrollTopSupport() {
-	$( window ).scrollTop( 1 );
-	return $( window ).scrollTop() === 1;
-}
-
-module( "position - within", {
-	setup: function(){
-		$("#within-container").css({"width": "70px", "height": "70px", "top": "20px", "left": "20px", "position": "relative"}).show();
-	}
-});
-
-var addTop = -20,
-	addLeft = -20;
-
-$.fn.addOffsets = function() {
-	var elOffset = this.offset(),
-		offset = $("#within-container").offset();
-
-	elOffset.top -= offset.top;
-	elOffset.left -= offset.left;
-
-	return {top: elOffset.top - offset.top, left: elOffset.left - offset.left };
-};
-
-test( "my, at, of", function() {
-	var within = $("#within-container");
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 40, left: addLeft + 40 }, "left top, left top" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 60, left: addLeft + 40 }, "left top, left bottom" );
-
-	$( "#elx" ).position({
-		my: "left",
-		at: "bottom",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 55, left: addLeft + 50 }, "left, bottom" );
-
-	$( "#elx" ).position({
-		my: "left foo",
-		at: "bar baz",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 45, left: addLeft +50 }, "left foo, bar baz" );
-});
-
-test( "multiple elements", function() {
-	var elements = $( "#el1, #el2" ),
-		result = elements.position({
-			my: "left top",
-			at: "left bottom",
-			of: "#parent",
-			collision: "none",
-			within: $("#within-container")
-		}),
-		expected = { top: addTop + 10, left: addLeft + 4 };
-
-	deepEqual( result, elements );
-	elements.each(function() {
-		deepEqual( $( this ).addOffsets(), expected );
-	});
-});
-
-test( "positions", function() {
-	var definitions = [],
-		offsets = {
-			left: 0,
-			center: 3,
-			right: 6,
-			top: 0,
-			bottom: 6
-		},
-		start = { left: 4, top: 4 },
-		el = $( "#el1" );
-	$.each( [ 0, 1 ], function( my ) {
-		$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
-			$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
-				definitions.push({
-					my: my ? horizontal + " " + vertical : "left top",
-					at: !my ? horizontal + " " + vertical : "left top",
-					result: {
-						top: addTop + (my ? start.top - offsets[ vertical ] : start.top + offsets[ vertical ]),
-						left: addLeft + (my ? start.left - offsets[ horizontal ] : start.left + offsets[ horizontal ])
-					}
-				});
-			});
-		});
-	});
-	$.each( definitions, function( index, definition ) {
-		el.position({
-			my: definition.my,
-			at: definition.at,
-			of: "#parent",
-			collision: "none",
-			within: $("#within-container")
-		});
-		deepEqual( el.addOffsets(), definition.result,
-			"Position via " + QUnit.jsDump.parse({ my:definition.my, at:definition.at }) );
-	});
-});
-
-test( "of", function() {
-	var event,
-		within = $( "#within-container" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 40, left: addLeft + 40 }, "selector" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: $( "#parentx"),
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 60, left: addLeft + 40 }, "jQuery object" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: $( "#parentx" )[ 0 ],
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 40, left: addLeft + 40 }, "DOM element" );
-
-	event = $.extend( $.Event( "someEvent" ), { pageX: 200, pageY: 300 } );
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left top",
-		of: event,
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: 300,
-		left: 200
-	}, "event - left top, left top" );
-
-	event = $.extend( $.Event( "someEvent" ), { pageX: 400, pageY: 600 } );
-	$( "#elx" ).position({
-		my: "left top",
-		at: "right bottom",
-		of: event,
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).offset(), {
-		top: 600,
-		left: 400
-	}, "event - left top, right bottom" );
-});
-
-test( "within:offsets", function() {
-	var within = $("#within-container");
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left+10 bottom+10",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 70, left: addLeft + 50 }, "offsets in at" );
-
-	$( "#elx" ).position({
-		my: "left+10 top-10",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 50, left: addLeft + 50 }, "offsets in my" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left+50% bottom-10%",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 58, left: addLeft + 50 }, "percentage offsets in at" );
-
-	$( "#elx" ).position({
-		my: "left-30% top+50%",
-		at: "left bottom",
-		of: "#parentx",
-		collision: "none",
-		within: within
-	});
-	deepEqual( $( "#elx" ).addOffsets(), { top: addTop + 65, left: addLeft + 37 }, "percentage offsets in my" );
-});
-
-test( "using", function() {
-	expect( 6 );
-
-	var within = $( "#within-container" ),
-		count = 0,
-		elems = $( "#el1, #el2" ),
-		expectedPosition = { top: addTop + 40, left: addLeft + 40 },
-		originalPosition = elems.position({
-			my: "right bottom",
-			at: "right bottom",
-			of: "#parentx",
-			collision: "none",
-			within: within
-		}).addOffsets();
-
-	elems.position({
-		my: "left top",
-		at: "left top",
-		of: "#parentx",
-		using: function( position ) {
-			position.top -= within.offset().top;
-			position.left -= within.offset().left;
-			deepEqual( this, elems[ count ], "correct context for call #" + count );
-			deepEqual( position, expectedPosition, "correct position for call #" + count );
-			count++;
-		},
-		within: within
-	});
-
-	elems.each(function() {
-		deepEqual( $( this ).addOffsets(), originalPosition, "elements not moved" );
-	});
-});
-
-function collisionTest( config, result, msg ) {
-	var within = $( "#within-container" ),
-		elem = $( "#elx" ).position( $.extend({
-			my: "left top",
-			at: "right bottom",
-			of: "#parentx",
-			within: within
-		}, config ) );
-
-	deepEqual( elem.addOffsets(), result, msg );
-}
-
-function collisionTest2( config, result, msg ) {
-	collisionTest( $.extend({
-		my: "right bottom",
-		at: "left top"
-	}, config ), result, msg );
-}
-
-test( "collision: fit, no offset", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	collisionTest({
-		collision: "fit"
-	}, { top: addTop + of.position().top + of.height() - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - $.position.getScrollInfo( within ).width }, "right bottom" );
-
-	collisionTest2({
-		collision: "fit"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
-});
-
-
-test( "collision: fit, with offset", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	collisionTest({
-		collision: "fit",
-		at: "right+2 bottom+3"
-	}, { top: addTop + of.position().top + of.height() - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - $.position.getScrollInfo( within ).width }, "right bottom");
-
-	collisionTest2({
-		collision: "fit",
-		at: "left+2 top+3"
-	}, { top: addTop + of.position().top - 7, left: addLeft + of.position().left - 8 }, "left top, positive offset" );
-
-	collisionTest2({
-		collision: "fit",
-		at: "left-2 top-3"
-	}, { top: addTop + of.position().top - 13, left: addLeft + of.position().left - 12 }, "left top, negative offset" );
-});
-
-test( "collision: none, within scrolled", function() {
-	if ( scrollTopSupport() ) {
-		var within = $("#within-container").css({"width": "1000px", "height": "800px", "overflow": "auto"}),
-			of = $("#parentx");
-		within.scrollTop( 300 ).scrollLeft( 150 );
-
-		collisionTest({
-			collision: "none",
-			at: "left-100 top-100"
-		}, { top: of.offset().top + addTop - 100 - of.height(), left: of.offset().left + addLeft - 100 - of.width() }, "top left" );
-		collisionTest2({
-			collision: "none",
-			at: "right+100 bottom+100"
-		}, { top: of.offset().top + addTop + 100 - 10, left: of.offset().left + addLeft + 100 - 10 }, "right bottom" );
-		within.scrollTop( 0 ).scrollLeft( 0 );
-	}
-});
-
-test( "collision: flip, no offset", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	collisionTest({
-		collision: "flip"
-	}, { top: addTop + of.position().top + of.height(), left: addLeft + of.position().left + of.width() }, "left top" );
-
-	collisionTest2({
-		collision: "flip"
-	}, { top: addTop + of.position().top - 10, left: addTop + of.position().top - 10 }, "right bottom" );
-});
-
-test( "collision: flip, with offset", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	collisionTest({
-		collision: "flip",
-		at: "right+2 bottom+3"
-	}, { top: addTop + of.position().top - 13, left: addLeft + of.position().left - 12 }, "left top, with offset added" );
-
-	collisionTest2({
-		collision: "flip",
-		at: "left+2 top+3"
-	}, { top: addTop + of.position().top - 10 + 3, left: addLeft + of.position().left - 10 + 2 }, "right bottom, positive offset" );
-
-	collisionTest2({
-		collision: "flip",
-		at: "left-2 top-3"
-	}, { top: addTop + of.position().top - 13, left: addLeft + of.position().left - 12 }, "right bottom, negative offset" );
-});
-
-test( "collision: none, no offset", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	collisionTest({
-		collision: "none"
-	}, { top: addTop + of.position().top + of.height(), left: addLeft + of.position().left + of.width() }, "left top" );
-
-	collisionTest2({
-		collision: "none"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "right bottom" );
-});
-
-test( "collision: none, with offset", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	collisionTest({
-		collision: "none",
-		at: "right+2 bottom+3"
-	}, { top: addTop + of.position().top + of.height() + 3, left: addLeft + of.position().left + of.width() + 2 }, "right bottom, with offset added" );
-
-	collisionTest2({
-		collision: "none",
-		at: "left+2 top+3"
-	}, { top: addTop + of.position().top - 7, left: addTop + of.position().top - 8 }, "left top, positive offset" );
-
-	collisionTest2({
-		collision: "none",
-		at: "left-2 top-3"
-	}, { top: addTop + of.position().top - 13, left: addTop + of.position().top - 12 }, "left top, negative offset" );
-});
-
-test( "collision: fit, with margin", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	$( "#elx" ).css( "margin", 10 );
-
-	collisionTest({
-		collision: "fit"
-	}, { top: addTop + of.position().top + of.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom" );
-
-	collisionTest2({
-		collision: "fit"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
-
-	$( "#elx" ).css({
-		"margin-left": 5,
-		"margin-top": 5
-	});
-
-	collisionTest({
-		collision: "fit"
-	}, { top: addTop + of.position().top + of.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom" );
-
-	collisionTest2({
-		collision: "fit"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
-
-	$( "#elx" ).css({
-		"margin-right": 15,
-		"margin-bottom": 15
-	});
-
-	collisionTest({
-		collision: "fit"
-	}, { top: addTop + of.position().top + of.height() - 15 - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - 15 - $.position.getScrollInfo( within ).width }, "right bottom" );
-
-	collisionTest2({
-		collision: "fit"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
-});
-
-test( "collision: flip, with margin", function() {
-	var within = $("#within-container"),
-		of = $("#parentx");
-
-	$( "#elx" ).css( "margin", 10 );
-
-	collisionTest({
-		collision: "flip"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
-
-	collisionTest2({
-		collision: "flip"
-	}, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "right bottom" );
-
-	$( "#elx" ).css( "margin", 0 );
-});
-
-test( "addClass: flipped left", function() {
-	var within = $("#within-container"),
-		elem = $( "#elx" ).position( {
-			my: "left center",
-			of: within[0],
-			within: within,
-			collision: "flip",
-			at: "right center"
-		});
-
-	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
-
-	elem.position({
-		my: "right center",
-		of: within[0],
-		within: within,
-		collision: "flip",
-		at: "left center"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Removed ui-flipped-left class' );
-});
-
-test( "addClass: flipped top", function() {
-	var within = $("#within-container"),
-		elem = $( "#elx" ).position( {
-			my: "left top",
-			of: within[0],
-			within: within,
-			collision: "flip",
-			at: "right bottom"
-		});
-
-	deepEqual( elem.hasClass( 'ui-flipped-top' ), false, 'Has ui-flipped-top class' );
-
-	elem.position( {
-		my: "left bottom",
-		of: within[0],
-		within: within,
-		collision: "flip",
-		at: "right top"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-top' ), false, 'Removed ui-flipped-top class' );
-});
-
-test( "addClass: flipped right", function() {
-	var within = $("#within-container"),
-		elem = $( "#elx" ).position( {
-			my: "right center",
-			of: within[0],
-			within: within,
-			collision: "flip",
-			at: "left center"
-		});
-
-	deepEqual( elem.hasClass( 'ui-flipped-right' ), false, 'Has ui-flipped-right class' );
-
-	elem.position( {
-		my: "left center",
-		of: within[0],
-		within: within,
-		collision: "flip",
-		at: "right center"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-right' ), false, 'Removed ui-flipped-right class' );
-
-});
-
-test( "addClass: flipped bottom", function() {
-	var within = $("#within-container"),
-		elem = $( "#elx" ).position( {
-			my: "left bottom",
-			of: window,
-			collision: "flip",
-			at: "right top"
-		});
-
-	deepEqual( elem.hasClass( 'ui-flipped-bottom' ), false, 'Has ui-flipped-bottom class' );
-
-	elem.position( {
-		my: "left top",
-		of: window,
-		collision: "flip",
-		at: "right bottom"
-	});
-
-	deepEqual( elem.hasClass( 'ui-flipped-bottom' ), false, 'Removed ui-flipped-bottom class' );
-});
-
-}( jQuery ) );
diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index 2a7769107..8794812a8 100644
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -33,25 +33,26 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 .height() returns the greater of the height and line-height
 -->
 
-<div id="qunit-fixture" style="top: 0; left: 0;">
+<div id="qunit-fixture" style="top: 0; left: 0; z-index:1">
 	<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
 	<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
 	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
-</div>
+	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px;"></div>
 
-<div style="position: absolute; top: 0px; left: 0px">
-	<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-	<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
-</div>
+	<div style="position: absolute; top: 0px; left: 0px">
+		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
+		<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
+	</div>
 
-<div style="position: absolute; height: 5000px; width: 5000px;"></div>
+	<div style="position: absolute; height: 5000px; width: 5000px;"></div>
 
-<div id="bug-5280" style="height: 30px; width: 201px;">
-	<div style="width: 50px; height: 10px;"></div>
-</div>
+	<div id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;">
+		<div id="fractions-element"></div>
+	</div>
 
-<div id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;">
-	<div id="fractions-element"></div>
+	<div id="bug-5280" style="height: 30px; width: 201px;">
+		<div style="width: 50px; height: 10px;"></div>
+	</div>
 </div>
 
 </body>
-- 
cgit v1.2.3


From 9df981d268b4029065247cf230a4e988946b7799 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 23 Apr 2012 16:07:58 -0400
Subject: Position: Added tests for flipfit.

---
 tests/unit/position/position_core.js | 60 ++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 3 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index 7a9a35132..0ebcabef3 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -387,6 +387,44 @@ test( "collision: flip, collision", function() {
 	}, "with offset" );
 });
 
+test( "collision: flipfit, no collision", function() {
+	expect( 2 );
+
+	collisionTest({
+		collision: "flipfit"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest({
+		collision: "flipfit",
+		at: "right+2 bottom+3"
+	}, {
+		top: 13,
+		left: 12
+	}, "with offset" );
+});
+
+test( "collision: flipfit, collision", function() {
+	expect( 2 );
+
+	collisionTest2({
+		collision: "flipfit"
+	}, {
+		top: 10,
+		left: 10
+	}, "no offset" );
+
+	collisionTest2({
+		collision: "flipfit",
+		at: "left+2 top+3"
+	}, {
+		top: 7,
+		left: 8
+	}, "with offset" );
+});
+
 test( "collision: none, no collision", function() {
 	expect( 2 );
 
@@ -480,7 +518,7 @@ test( "collision: flip, with margin", function() {
 });
 
 test( "within", function() {
-	expect( 4 );
+	expect( 6 );
 
 	collisionTest({
 		within: "#within",
@@ -504,7 +542,7 @@ test( "within", function() {
 	}, {
 		top: 10,
 		left: -6
-	}, "fit - right bottom" );
+	}, "flip - right bottom" );
 
 	collisionTest2({
 		within: "#within",
@@ -512,7 +550,23 @@ test( "within", function() {
 	}, {
 		top: 10,
 		left: -6
-	}, "fit - left top" );
+	}, "flip - left top" );
+
+	collisionTest({
+		within: "#within",
+		collision: "flipfit"
+	}, {
+		top: 4,
+		left: 0
+	}, "flipfit - right bottom" );
+
+	collisionTest2({
+		within: "#within",
+		collision: "flipfit"
+	}, {
+		top: 4,
+		left: 0
+	}, "flipfit - left top" );
 });
 
 test( "fractions", function() {
-- 
cgit v1.2.3


From f3b022ddb8815974f52aeeddb79d209645041653 Mon Sep 17 00:00:00 2001
From: Shahyar G <shahyar@gmail.com>
Date: Mon, 23 Apr 2012 14:25:23 -0400
Subject: Use length property, instead of the deprecated size() method.

---
 tests/unit/accordion/accordion_deprecated.js | 48 +++++++--------
 tests/unit/accordion/accordion_events.js     | 68 ++++++++++----------
 tests/unit/accordion/accordion_options.js    |  2 +-
 tests/unit/tabs/tabs_deprecated.js           |  2 +-
 tests/unit/tabs/tabs_events.js               | 92 ++++++++++++++--------------
 tests/unit/tabs/tabs_methods.js              | 16 ++---
 tests/unit/tabs/tabs_options.js              |  2 +-
 ui/jquery.ui.accordion.js                    |  4 +-
 8 files changed, 117 insertions(+), 117 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
index 8d8e8a0d6..7f033a340 100644
--- a/tests/unit/accordion/accordion_deprecated.js
+++ b/tests/unit/accordion/accordion_deprecated.js
@@ -259,11 +259,11 @@ test( "changestart", function() {
 		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionchangestart", function( event, ui ) {
-		equal( ui.oldHeader.size(), 0 );
-		equal( ui.oldContent.size(), 0 );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldContent.length, 0 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 		state( element, 0, 0, 0 );
 	});
@@ -271,13 +271,13 @@ test( "changestart", function() {
 	state( element, 1, 0, 0 );
 
 	element.one( "accordionchangestart", function( event, ui ) {
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 		state( element, 1, 0, 0 );
 	});
@@ -285,12 +285,12 @@ test( "changestart", function() {
 	state( element, 0, 1, 0 );
 
 	element.one( "accordionchangestart", function( event, ui ) {
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.size(), 0 );
-		equal( ui.newContent.size(), 0 );
+		equal( ui.newHeader.length, 0 );
+		equal( ui.newContent.length, 0 );
 		state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
@@ -307,34 +307,34 @@ test( "change", function() {
 		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionchange", function( event, ui ) {
-		equal( ui.oldHeader.size(), 0 );
-		equal( ui.oldContent.size(), 0 );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldContent.length, 0 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 	});
 	element.accordion( "option", "active", 0 );
 
 	element.one( "accordionchange", function( event, ui ) {
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 	});
 	headers.eq( 1 ).click();
 
 	element.one( "accordionchange", function( event, ui ) {
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.size(), 0 );
-		equal( ui.newContent.size(), 0 );
+		equal( ui.newHeader.length, 0 );
+		equal( ui.newContent.length, 0 );
 	});
 	element.accordion( "option", "active", false );
 });
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 932e4637d..079c71a62 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -14,9 +14,9 @@ test( "create", function() {
 
 	element.accordion({
 		create: function( event, ui ) {
-			equal( ui.header.size(), 1, "header size" );
+			equal( ui.header.length, 1, "header length" );
 			strictEqual( ui.header[ 0 ], headers[ 0 ], "header" );
-			equal( ui.content.size(), 1, "content size" );
+			equal( ui.content.length, 1, "content length" );
 			strictEqual( ui.content[ 0 ], contents[ 0 ], "content" );
 		}
 	});
@@ -25,9 +25,9 @@ test( "create", function() {
 	element.accordion({
 		active: 2,
 		create: function( event, ui ) {
-			equal( ui.header.size(), 1, "header size" );
+			equal( ui.header.length, 1, "header length" );
 			strictEqual( ui.header[ 0 ], headers[ 2 ], "header" );
-			equal( ui.content.size(), 1, "content size" );
+			equal( ui.content.length, 1, "content length" );
 			strictEqual( ui.content[ 0 ], contents[ 2 ], "content" );
 		}
 	});
@@ -37,8 +37,8 @@ test( "create", function() {
 		active: false,
 		collapsible: true,
 		create: function( event, ui ) {
-			equal( ui.header.size(), 0, "header size" );
-			equal( ui.content.size(), 0, "content size" );
+			equal( ui.header.length, 0, "header length" );
+			equal( ui.content.length, 0, "content length" );
 		}
 	});
 	element.accordion( "destroy" );
@@ -55,11 +55,11 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
-		equal( ui.oldHeader.size(), 0 );
-		equal( ui.oldContent.size(), 0 );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldContent.length, 0 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 		state( element, 0, 0, 0 );
 	});
@@ -68,13 +68,13 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		equal( event.originalEvent.type, "click" );
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 		state( element, 1, 0, 0 );
 	});
@@ -83,12 +83,12 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.size(), 0 );
-		equal( ui.newContent.size(), 0 );
+		equal( ui.newHeader.length, 0 );
+		equal( ui.newContent.length, 0 );
 		state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
@@ -96,11 +96,11 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
-		equal( ui.oldHeader.size(), 0 );
-		equal( ui.oldContent.size(), 0 );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldContent.length, 0 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 2 ] );
 		event.preventDefault();
 		state( element, 0, 0, 0 );
@@ -119,34 +119,34 @@ test( "activate", function() {
 		content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionactivate", function( event, ui ) {
-		equal( ui.oldHeader.size(), 0 );
-		equal( ui.oldContent.size(), 0 );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.length, 0 );
+		equal( ui.oldContent.length, 0 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 	});
 	element.accordion( "option", "active", 0 );
 
 	element.one( "accordionactivate", function( event, ui ) {
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.size(), 1 );
+		equal( ui.newContent.length, 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 	});
 	headers.eq( 1 ).click();
 
 	element.one( "accordionactivate", function( event, ui ) {
-		equal( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.length, 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.size(), 0 );
-		equal( ui.newContent.size(), 0 );
+		equal( ui.newHeader.length, 0 );
+		equal( ui.newContent.length, 0 );
 	});
 	element.accordion( "option", "active", false );
 
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index f64ddc675..3c7863520 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -20,7 +20,7 @@ test( "{ active: false }", function() {
 		collapsible: true
 	});
 	state( element, 0, 0, 0 );
-	equal( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
+	equal( element.find( ".ui-accordion-header.ui-state-active" ).length, 0, "no headers selected" );
 	equal( element.accordion( "option", "active" ), false );
 
 	element.accordion( "option", "collapsible", false );
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 8386a13ac..8d3685b3d 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -187,7 +187,7 @@ test( "selected", function() {
 		collapsible: true
 	});
 	state( element, 0, 0, 0 );
-	equal( element.find( ".ui-tabs-nav .ui-state-active" ).size(), 0, "no tabs selected" );
+	equal( element.find( ".ui-tabs-nav .ui-state-active" ).length, 0, "no tabs selected" );
 	strictEqual( element.tabs( "option", "selected" ), -1 );
 
 	element.tabs( "option", "collapsible", false );
diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js
index 3f6ec14d0..f33686581 100644
--- a/tests/unit/tabs/tabs_events.js
+++ b/tests/unit/tabs/tabs_events.js
@@ -13,9 +13,9 @@ test( "create", function() {
 
 	element.tabs({
 		create: function( event, ui ) {
-			equal( ui.tab.size(), 1, "tab size" );
+			equal( ui.tab.length, 1, "tab length" );
 			strictEqual( ui.tab[ 0 ], tabs[ 0 ], "tab" );
-			equal( ui.panel.size(), 1, "panel size" );
+			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panels[ 0 ], "panel" );
 		}
 	});
@@ -24,9 +24,9 @@ test( "create", function() {
 	element.tabs({
 		active: 2,
 		create: function( event, ui ) {
-			equal( ui.tab.size(), 1, "tab size" );
+			equal( ui.tab.length, 1, "tab length" );
 			strictEqual( ui.tab[ 0 ], tabs[ 2 ], "tab" );
-			equal( ui.panel.size(), 1, "panel size" );
+			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panels[ 2 ], "panel" );
 		}
 	});
@@ -36,8 +36,8 @@ test( "create", function() {
 		active: false,
 		collapsible: true,
 		create: function( event, ui ) {
-			equal( ui.tab.size(), 0, "tab size" );
-			equal( ui.panel.size(), 0, "panel size" );
+			equal( ui.tab.length, 0, "tab length" );
+			equal( ui.panel.length, 0, "panel length" );
 		}
 	});
 	element.tabs( "destroy" );
@@ -56,11 +56,11 @@ test( "beforeActivate", function() {
 	// from collapsed
 	element.one( "tabsbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.size(), 0, "oldTab size" );
-		equal( ui.oldPanel.size(), 0, "oldPanel size" );
-		equal( ui.newTab.size(), 1, "newTab size" );
+		equal( ui.oldTab.length, 0, "oldTab length" );
+		equal( ui.oldPanel.length, 0, "oldPanel length" );
+		equal( ui.newTab.length, 1, "newTab length" );
 		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
-		equal( ui.newPanel.size(), 1, "newPanel size" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
 		state( element, 0, 0, 0 );
 	});
@@ -70,13 +70,13 @@ test( "beforeActivate", function() {
 	// switching tabs
 	element.one( "tabsbeforeactivate", function( event, ui ) {
 		equal( event.originalEvent.type, "click", "originalEvent" );
-		equal( ui.oldTab.size(), 1, "oldTab size" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
 		strictEqual( ui.oldTab[ 0 ], tabs[ 0 ], "oldTab" );
-		equal( ui.oldPanel.size(), 1, "oldPanel size" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
 		strictEqual( ui.oldPanel[ 0 ], panels[ 0 ], "oldPanel" );
-		equal( ui.newTab.size(), 1, "newTab size" );
+		equal( ui.newTab.length, 1, "newTab length" );
 		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
-		equal( ui.newPanel.size(), 1, "newPanel size" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		state( element, 1, 0, 0 );
 	});
@@ -86,12 +86,12 @@ test( "beforeActivate", function() {
 	// collapsing
 	element.one( "tabsbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.size(), 1, "oldTab size" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
 		strictEqual( ui.oldTab[ 0 ], tabs[ 1 ], "oldTab" );
-		equal( ui.oldPanel.size(), 1, "oldPanel size" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
 		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
-		equal( ui.newTab.size(), 0, "newTab size" );
-		equal( ui.newPanel.size(), 0, "newPanel size" );
+		equal( ui.newTab.length, 0, "newTab length" );
+		equal( ui.newPanel.length, 0, "newPanel length" );
 		state( element, 0, 1, 0 );
 	});
 	element.tabs( "option", "active", false );
@@ -100,11 +100,11 @@ test( "beforeActivate", function() {
 	// prevent activation
 	element.one( "tabsbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.size(), 0, "oldTab size" );
-		equal( ui.oldPanel.size(), 0, "oldTab" );
-		equal( ui.newTab.size(), 1, "newTab size" );
+		equal( ui.oldTab.length, 0, "oldTab length" );
+		equal( ui.oldPanel.length, 0, "oldTab" );
+		equal( ui.newTab.length, 1, "newTab length" );
 		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
-		equal( ui.newPanel.size(), 1, "newPanel size" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		event.preventDefault();
 		state( element, 0, 0, 0 );
@@ -126,11 +126,11 @@ test( "activate", function() {
 	// from collapsed
 	element.one( "tabsactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.size(), 0, "oldTab size" );
-		equal( ui.oldPanel.size(), 0, "oldPanel size" );
-		equal( ui.newTab.size(), 1, "newTab size" );
+		equal( ui.oldTab.length, 0, "oldTab length" );
+		equal( ui.oldPanel.length, 0, "oldPanel length" );
+		equal( ui.newTab.length, 1, "newTab length" );
 		strictEqual( ui.newTab[ 0 ], tabs[ 0 ], "newTab" );
-		equal( ui.newPanel.size(), 1, "newPanel size" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 0 ], "newPanel" );
 		state( element, 1, 0, 0 );
 	});
@@ -140,13 +140,13 @@ test( "activate", function() {
 	// switching tabs
 	element.one( "tabsactivate", function( event, ui ) {
 		equal( event.originalEvent.type, "click", "originalEvent" );
-		equal( ui.oldTab.size(), 1, "oldTab size" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
 		strictEqual( ui.oldTab[ 0 ], tabs[ 0 ], "oldTab" );
-		equal( ui.oldPanel.size(), 1, "oldPanel size" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
 		strictEqual( ui.oldPanel[ 0 ], panels[ 0 ], "oldPanel" );
-		equal( ui.newTab.size(), 1, "newTab size" );
+		equal( ui.newTab.length, 1, "newTab length" );
 		strictEqual( ui.newTab[ 0 ], tabs[ 1 ], "newTab" );
-		equal( ui.newPanel.size(), 1, "newPanel size" );
+		equal( ui.newPanel.length, 1, "newPanel length" );
 		strictEqual( ui.newPanel[ 0 ], panels[ 1 ], "newPanel" );
 		state( element, 0, 1, 0 );
 	});
@@ -156,12 +156,12 @@ test( "activate", function() {
 	// collapsing
 	element.one( "tabsactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.oldTab.size(), 1, "oldTab size" );
+		equal( ui.oldTab.length, 1, "oldTab length" );
 		strictEqual( ui.oldTab[ 0 ], tabs[ 1 ], "oldTab" );
-		equal( ui.oldPanel.size(), 1, "oldPanel size" );
+		equal( ui.oldPanel.length, 1, "oldPanel length" );
 		strictEqual( ui.oldPanel[ 0 ], panels[ 1 ], "oldPanel" );
-		equal( ui.newTab.size(), 0, "newTab size" );
-		equal( ui.newPanel.size(), 0, "newPanel size" );
+		equal( ui.newTab.length, 0, "newTab length" );
+		equal( ui.newPanel.length, 0, "newPanel length" );
 		state( element, 0, 0, 0 );
 	});
 	element.tabs( "option", "active", false );
@@ -193,9 +193,9 @@ test( "beforeLoad", function() {
 		ok( !( "originalEvent" in event ), "originalEvent" );
 		ok( "abort" in ui.jqXHR, "jqXHR" );
 		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
-		equal( ui.tab.size(), 1, "tab size" );
+		equal( ui.tab.length, 1, "tab length" );
 		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.size(), 1, "panel size" );
+		equal( ui.panel.length, 1, "panel length" );
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		equal( ui.panel.html(), "", "panel html" );
 		event.preventDefault();
@@ -215,9 +215,9 @@ test( "beforeLoad", function() {
 		ok( !( "originalEvent" in event ), "originalEvent" );
 		ok( "abort" in ui.jqXHR, "jqXHR" );
 		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
-		equal( ui.tab.size(), 1, "tab size" );
+		equal( ui.tab.length, 1, "tab length" );
 		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.size(), 1, "panel size" );
+		equal( ui.panel.length, 1, "panel length" );
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		equal( ui.panel.html(), "", "panel html" );
 		event.preventDefault();
@@ -237,9 +237,9 @@ test( "beforeLoad", function() {
 		equal( event.originalEvent.type, "click", "originalEvent" );
 		ok( "abort" in ui.jqXHR, "jqXHR" );
 		ok( ui.ajaxSettings.url, "data/test.html", "ajaxSettings.url" );
-		equal( ui.tab.size(), 1, "tab size" );
+		equal( ui.tab.length, 1, "tab length" );
 		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.size(), 1, "panel size" );
+		equal( ui.panel.length, 1, "panel length" );
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		ui.panel.html( "<p>testing</p>" );
 		event.preventDefault();
@@ -265,9 +265,9 @@ if ( $.uiBackCompat === false ) {
 			panel = $( "#" + panelId );
 
 			ok( !( "originalEvent" in event ), "originalEvent" );
-			equal( ui.tab.size(), 1, "tab size" );
+			equal( ui.tab.length, 1, "tab length" );
 			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-			equal( ui.panel.size(), 1, "panel size" );
+			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 			equal( ui.panel.find( "p" ).length, 1, "panel html" );
 			state( element, 0, 0, 1, 0, 0 );
@@ -283,9 +283,9 @@ if ( $.uiBackCompat === false ) {
 				panel = $( "#" + panelId );
 
 				ok( !( "originalEvent" in event ), "originalEvent" );
-				equal( ui.tab.size(), 1, "tab size" );
+				equal( ui.tab.length, 1, "tab length" );
 				strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-				equal( ui.panel.size(), 1, "panel size" );
+				equal( ui.panel.length, 1, "panel length" );
 				strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 				equal( ui.panel.find( "p" ).length, 1, "panel html" );
 				state( element, 0, 0, 0, 1, 0 );
@@ -302,9 +302,9 @@ if ( $.uiBackCompat === false ) {
 				panel = $( "#" + panelId );
 
 				equal( event.originalEvent.type, "click", "originalEvent" );
-				equal( ui.tab.size(), 1, "tab size" );
+				equal( ui.tab.length, 1, "tab length" );
 				strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-				equal( ui.panel.size(), 1, "panel size" );
+				equal( ui.panel.length, 1, "panel length" );
 				strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 				equal( ui.panel.find( "p" ).length, 1, "panel html" );
 				state( element, 0, 0, 0, 0, 1 );
diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js
index 61ce78189..0837995e6 100644
--- a/tests/unit/tabs/tabs_methods.js
+++ b/tests/unit/tabs/tabs_methods.js
@@ -161,9 +161,9 @@ asyncTest( "load", function() {
 			panel = $( "#" + panelId );
 
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( ui.tab.size(), 1, "tab size" );
+		equal( ui.tab.length, 1, "tab length" );
 		strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-		equal( ui.panel.size(), 1, "panel size" );
+		equal( ui.panel.length, 1, "panel length" );
 		strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 		state( element, 1, 0, 0, 0, 0 );
 	});
@@ -176,9 +176,9 @@ asyncTest( "load", function() {
 			panel = $( "#" + panelId );
 
 		ok( !( "originalEvent" in event ), "originalEvent" );
-		equal( uiTab.size(), 1, "tab size" );
+		equal( uiTab.length, 1, "tab length" );
 		strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
-		equal( uiPanel.size(), 1, "panel size" );
+		equal( uiPanel.length, 1, "panel length" );
 		strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
 		equal( uiPanel.find( "p" ).length, 1, "panel html" );
 		state( element, 1, 0, 0, 0, 0 );
@@ -208,9 +208,9 @@ asyncTest( "load", function() {
 				panel = $( "#" + panelId );
 
 			ok( !( "originalEvent" in event ), "originalEvent" );
-			equal( ui.tab.size(), 1, "tab size" );
+			equal( ui.tab.length, 1, "tab length" );
 			strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" );
-			equal( ui.panel.size(), 1, "panel size" );
+			equal( ui.panel.length, 1, "panel length" );
 			strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" );
 			state( element, 0, 0, 0, 1, 0 );
 		});
@@ -223,9 +223,9 @@ asyncTest( "load", function() {
 				panel = $( "#" + panelId );
 
 			ok( !( "originalEvent" in event ), "originalEvent" );
-			equal( uiTab.size(), 1, "tab size" );
+			equal( uiTab.length, 1, "tab length" );
 			strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" );
-			equal( uiPanel.size(), 1, "panel size" );
+			equal( uiPanel.length, 1, "panel length" );
 			strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" );
 			state( element, 0, 0, 0, 1, 0 );
 			start();
diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index 40d4ceaa7..ae9e7bdc6 100644
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -29,7 +29,7 @@ test( "{ active: false }", function() {
 		collapsible: true
 	});
 	state( element, 0, 0, 0 );
-	equal( element.find( ".ui-tabs-nav .ui-state-active" ).size(), 0, "no tabs selected" );
+	equal( element.find( ".ui-tabs-nav .ui-state-active" ).length, 0, "no tabs selected" );
 	strictEqual( element.tabs( "option", "active" ), false );
 
 	element.tabs( "option", "collapsible", false );
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 81f74f0b9..8d062ad51 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -497,10 +497,10 @@ $.widget( "ui.accordion", {
 		easing = easing || options.easing || animate.easing;
 		duration = duration || options.duration || animate.duration;
 
-		if ( !toHide.size() ) {
+		if ( !toHide.length ) {
 			return toShow.animate( showProps, duration, easing, complete );
 		}
-		if ( !toShow.size() ) {
+		if ( !toShow.length ) {
 			return toHide.animate( hideProps, duration, easing, complete );
 		}
 
-- 
cgit v1.2.3


From 88e141801cbd2d149f98d11f7674f35a9e06e288 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 24 Apr 2012 07:43:26 -0400
Subject: Tests: Check for null error objects when reporting JSHint errors.

---
 tests/unit/testsuite.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tests/unit')

diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 7e505979c..faef90a9d 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -48,6 +48,11 @@ function testJshint( widget ) {
 		).done(function( hintArgs, srcArgs ) {
 			var passed = JSHINT( srcArgs[ 0 ], hintArgs[ 0 ] ),
 				errors = $.map( JSHINT.errors, function( error ) {
+					// JSHINT may report null if there are too many errors
+					if ( !error ) {
+						return;
+					}
+
 					return "[L" + error.line + ":C" + error.character + "] " +
 						error.reason + "\n" + error.evidence + "\n";
 				}).join( "\n" );
-- 
cgit v1.2.3


From cbc5207c4101e370ada65ed6aaed7e7082c95dea Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Tue, 24 Apr 2012 09:04:58 -0400
Subject: Position tests: Fixed typo.

---
 tests/unit/position/position_core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index 0ebcabef3..837327b5d 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -310,7 +310,7 @@ test( "collision: fit, no collision", function() {
 	}, "no offset" );
 
 	collisionTest({
-		collition: "fit",
+		collision: "fit",
 		at: "right+2 bottom+3"
 	}, {
 		top: 13,
-- 
cgit v1.2.3


From 1a0f2e46593ec9e3fbca51175d342210a9996fba Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Tue, 24 Apr 2012 16:17:02 +0200
Subject: Position: Extend unit test for using to check feedback properties

---
 tests/unit/position/position_core.js | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index 0ebcabef3..b567b7299 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -255,11 +255,30 @@ test( "offsets", function() {
 });
 
 test( "using", function() {
-	expect( 6 );
+	expect( 10 );
 
 	var count = 0,
 		elems = $( "#el1, #el2" ),
-		expectedPosition = { top: 40, left: 40 },
+		of = $( "#parentx" ),
+		expectedPosition = { top: 60, left: 60 },
+		expectedFeedback = {
+			target: {
+				element: of,
+				width: 20,
+				height: 20,
+				left: 40,
+				top: 40
+			},
+			element: {
+				width: 6,
+				height: 6,
+				left: 60,
+				top: 60
+			},
+			horizontal: "left",
+			vertical: "top",
+			important: "vertical"
+		},
 		originalPosition = elems.position({
 			my: "right bottom",
 			at: "rigt bottom",
@@ -269,11 +288,14 @@ test( "using", function() {
 
 	elems.position({
 		my: "left top",
-		at: "left top",
+		at: "center+10 bottom",
 		of: "#parentx",
-		using: function( position ) {
+		using: function( position, feedback ) {
 			deepEqual( this, elems[ count ], "correct context for call #" + count );
 			deepEqual( position, expectedPosition, "correct position for call #" + count );
+			deepEqual( feedback.element.element[ 0 ], elems[ count ] );
+			delete feedback.element.element;
+			deepEqual( feedback, expectedFeedback );
 			count++;
 		}
 	});
-- 
cgit v1.2.3


From 252352e12473034dc86917bc9c7c1f764e6f7eb4 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Tue, 24 Apr 2012 17:23:25 +0200
Subject: Position: Fix scrollbar calculcation to correctly take
 overflow:scroll into account, along with unit tests

---
 tests/unit/position/position.html          |  2 +-
 tests/unit/position/position_core.js       | 61 ++++++++++++++++++++++++++++++
 tests/visual/position/position_within.html |  2 +-
 ui/jquery.ui.position.js                   | 11 +++---
 4 files changed, 69 insertions(+), 7 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 518e1f960..2a6e43d36 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -43,7 +43,7 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
 	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px;"></div>
 
-	<div style="position: absolute; top: 0px; left: 0px">
+	<div id="scrollx" style="position: absolute; top: 0px; left: 0px">
 		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
 		<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
 	</div>
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index b567b7299..f15ea48cc 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -591,6 +591,67 @@ test( "within", function() {
 	}, "flipfit - left top" );
 });
 
+test( "with scrollbars", function() {
+	expect( 4 );
+
+	$( "#scrollx" ).css({
+		width: 100,
+		height: 100,
+		left: 0,
+		top: 0
+	});
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90,
+		left: 90
+	}, "visible" );
+
+	$( "#scrollx" ).css({
+		overflow: "scroll"
+	});
+
+	var scrollbarInfo = $.position.getScrollInfo( $.position.getWithinInfo( $( "#scrollx" ) ) );
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90 - scrollbarInfo.height,
+		left: 90 - scrollbarInfo.width
+	}, "scroll" );
+
+	$( "#scrollx" ).css({
+		overflow: "auto"
+	});
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90,
+		left: 90
+	}, "auto, no scroll" );
+
+	$( "#scrollx" ).css({
+		overflow: "auto"
+	}).append( $("<div>").height(300).width(300) );
+
+	collisionTest({
+		of: "#scrollx",
+		collision: "fit",
+		within: "#scrollx"
+	}, {
+		top: 90 - scrollbarInfo.height,
+		left: 90 - scrollbarInfo.width
+	}, "auto, with scroll" );
+});
+
 test( "fractions", function() {
 	expect( 1 );
 
diff --git a/tests/visual/position/position_within.html b/tests/visual/position/position_within.html
index 7d8813582..692cb1067 100644
--- a/tests/visual/position/position_within.html
+++ b/tests/visual/position/position_within.html
@@ -97,7 +97,7 @@
                     collision: $( "#collision_horizontal" ).val() + " " + $( "#collision_vertical" ).val()
                 });
             }
-            $( ".demo" ).append("<div style='width:5000px;height:5000px;' />").css("overflow","auto");
+            $( ".demo" ).css("overflow","scroll");
 
             $( ".positionable" ).css( "opacity", 0.5 );
 
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index b8764f2bb..d4d09bee4 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -58,12 +58,13 @@ $.position = {
 	getScrollInfo: function( within ) {
 		var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
 			overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
-			scrollbarWidth = overflowX === "auto" || overflowX === "scroll" ? $.position.scrollbarWidth() : 0,
-			scrollbarHeight = overflowY === "auto" || overflowY === "scroll" ? $.position.scrollbarWidth() : 0;
-
+			hasOverflowX = overflowX === "scroll" ||
+				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+			hasOverflowY = overflowY === "scroll" ||
+				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
 		return {
-			height: within.height < within.element[0].scrollHeight ? scrollbarHeight : 0,
-			width: within.width < within.element[0].scrollWidth ? scrollbarWidth : 0
+			width: hasOverflowX ? $.position.scrollbarWidth() : 0,
+			height: hasOverflowY ? $.position.scrollbarWidth() : 0
 		};
 	},
 	getWithinInfo: function( element ) {
-- 
cgit v1.2.3


From 258a637cc614f54dcf5af2ae4fc5dc26d5a630d0 Mon Sep 17 00:00:00 2001
From: "Richard D. Worth" <rdworth@gmail.com>
Date: Thu, 26 Apr 2012 09:47:05 -0400
Subject: Fix various issues in our html files, fifth batch

---
 tests/static/icons.html                       | 67 +++++++++++++++++++++++++++
 tests/unit/core/core.html                     |  6 +--
 tests/unit/resizable/resizable.html           |  2 +-
 tests/unit/tabs/tabs.html                     |  1 +
 tests/unit/tabs/tabs_deprecated.html          |  1 +
 tests/visual/button/button_disabled_true.html |  2 +-
 tests/visual/position/position_fit.html       | 40 ++++++++--------
 tests/visual/position/position_flip.html      | 22 ++++-----
 tests/visual/position/position_flipfit.html   | 28 +++++------
 9 files changed, 119 insertions(+), 50 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/static/icons.html b/tests/static/icons.html
index adaf5f1cd..d3ae3e348 100644
--- a/tests/static/icons.html
+++ b/tests/static/icons.html
@@ -49,6 +49,12 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-nw"><span class="ui-icon ui-icon-carat-1-nw"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-n-s"><span class="ui-icon ui-icon-carat-2-n-s"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-e-w"><span class="ui-icon ui-icon-carat-2-e-w"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></div></td>
@@ -61,6 +67,12 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-nw"><span class="ui-icon ui-icon-triangle-1-nw"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></div></td>
@@ -111,6 +123,10 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-n"><span class="ui-icon ui-icon-arrowrefresh-1-n"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-e"><span class="ui-icon ui-icon-arrowrefresh-1-e"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></div></td>
@@ -121,6 +137,14 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-shuffle"><span class="ui-icon ui-icon-shuffle"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-transfer-e-w"><span class="ui-icon ui-icon-transfer-e-w"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-transferthick-e-w"><span class="ui-icon ui-icon-transferthick-e-w"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></div></td>
@@ -187,6 +211,12 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-radio-on"><span class="ui-icon ui-icon-radio-on"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-pin-w"><span class="ui-icon ui-icon-pin-w"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></div></td>
@@ -199,6 +229,12 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-eject"><span class="ui-icon ui-icon-eject"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></div></td>
@@ -208,6 +244,15 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-battery-1"><span class="ui-icon ui-icon-battery-1"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-battery-2"><span class="ui-icon ui-icon-battery-2"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-battery-3"><span class="ui-icon ui-icon-battery-3"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></div></td>
@@ -224,6 +269,8 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></div></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></div></td>
@@ -232,6 +279,16 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-plus"><span class="ui-icon ui-icon-squaresmall-plus"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 	<tr>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></div></td>
@@ -240,6 +297,16 @@
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></div></td>
 			<td><div class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></div></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
+			<td></td>
 	</tr>
 </table>
 
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 272b15d2c..09b024835 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -54,14 +54,14 @@
 	<input type="text" id="visibleAncestor-inputTypeText">
 	<input type="checkbox" id="visibleAncestor-inputTypeCheckbox">
 	<input type="radio" id="visibleAncestor-inputTypeRadio">
-	<input type="button" id="visibleAncestor-inputTypeButton">
+	<input type="button" id="visibleAncestor-inputTypeButton" value="visibleAncestor-inputTypeButton">
 	<input type="hidden" id="visibleAncestor-inputTypeHidden">
 	<button id="visibleAncestor-button">x</button>
 	<select id="visibleAncestor-select">
 		<option>option</option>
 	</select>
 	<textarea id="visibleAncestor-textarea">x</textarea>
-	<object id="visibleAncestor-object" codebase="about:blank">xxx</object>
+	<object id="visibleAncestor-object" data="about:blank" type="text/html">xxx</object>
 	<a href="#" id="visibleAncestor-anchorWithHref">anchor</a>
 	<a id="visibleAncestor-anchorWithoutHref">anchor</a>
 	<span id="visibleAncestor-span">x</span>
@@ -75,7 +75,7 @@
 	<input type="text" id="disabledElement-inputTypeText" disabled="disabled">
 	<input type="checkbox" id="disabledElement-inputTypeCheckbox" disabled="disabled">
 	<input type="radio" id="disabledElement-inputTypeRadio" disabled="disabled">
-	<input type="button" id="disabledElement-inputTypeButton" disabled="disabled">
+	<input type="button" id="disabledElement-inputTypeButton" disabled="disabled" value="disabledElement-inputTypeButton">
 	<input type="hidden" id="disabledElement-inputTypeHidden" disabled="disabled">
 	<button id="disabledElement-button" disabled="disabled"></button>
 	<select id="disabledElement-select" disabled="disabled"></select>
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 9baa67493..558574c5f 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -49,7 +49,7 @@
 <div id="qunit-fixture">
 
 <div id="resizable1" style="background: green; width: 100px; height: 100px;">I'm a resizable.</div>
-<img src="images/test.jpg" id="resizable2" style="width: 100px; height: 100px;">
+<img src="images/test.jpg" id="resizable2" style="width: 100px; height: 100px;" alt="solid gray">
 
 </div>
 </body>
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index fc7bfeedf..b961c60f3 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -62,6 +62,7 @@
 	</ul>
 	<div id="colon:test"></div>
 	<div style="height: 300px;" id="inline-style"></div>
+	<div id="custom-id"></div>
 </div>
 
 <div id="tabs3">
diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index 0c7611c9d..09afc91b4 100644
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -61,6 +61,7 @@
 	</ul>
 	<div id="colon:test"></div>
 	<div style="height: 300px;" id="inline-style"></div>
+	<div id="custom-id"></div>
 </div>
 
 <div id="tabs3">
diff --git a/tests/visual/button/button_disabled_true.html b/tests/visual/button/button_disabled_true.html
index 25388a484..83a3e9cd6 100644
--- a/tests/visual/button/button_disabled_true.html
+++ b/tests/visual/button/button_disabled_true.html
@@ -46,7 +46,7 @@
 
 <fieldset>
 	<legend>anchor</legend>
-	<a href="javascript:void(0)" disabled="disabled">anchor 1</a>
+	<a href="javascript:void(0)">anchor 1</a> # Attribute "disabled" not allowed on element "a" at this point.
 	<hr />
 	<a href="javascript:void(0)" id="anchor1">anchor 1</a>
 </fieldset>
diff --git a/tests/visual/position/position_fit.html b/tests/visual/position/position_fit.html
index dbd52550f..acb2672bc 100644
--- a/tests/visual/position/position_fit.html
+++ b/tests/visual/position/position_fit.html
@@ -16,8 +16,8 @@
 		$("ul").insertAfter(inputs);
 		inputs.each(function(index) {
 			$(this).position({
-				my: this.id.replace(/-/, " "),
-				at: this.id.replace(/-/, " "),
+				my: $(this).data("position").replace(/-/, " "),
+				at: $(this).data("position").replace(/-/, " "),
 				of: "#container"+index,
 				collision: "none"
 			});
@@ -113,25 +113,25 @@
 <div id="container16" class="container2"></div>
 <div id="container17" class="container2"></div>
 
-<input id="left-top" />
-<input id="center-top" />
-<input id="right-top" />
-<input id="left-top" />
-<input id="center-top" />
-<input id="right-top" />
-<input id="left-top" />
-<input id="center-top" />
-<input id="right-top" />
+<input data-position="left-top" />
+<input data-position="center-top" />
+<input data-position="right-top" />
+<input data-position="left-top" />
+<input data-position="center-top" />
+<input data-position="right-top" />
+<input data-position="left-top" />
+<input data-position="center-top" />
+<input data-position="right-top" />
 
-<input id="left-top" />
-<input id="center-center" />
-<input id="right-bottom" />
-<input id="left-top" />
-<input id="center-center" />
-<input id="right-bottom" />
-<input id="left-top" />
-<input id="center-center" />
-<input id="right-bottom" />
+<input data-position="left-top" />
+<input data-position="center-center" />
+<input data-position="right-bottom" />
+<input data-position="left-top" />
+<input data-position="center-center" />
+<input data-position="right-bottom" />
+<input data-position="left-top" />
+<input data-position="center-center" />
+<input data-position="right-bottom" />
 
 <ul>
 	<li><a href="#">Java</a></li>
diff --git a/tests/visual/position/position_flip.html b/tests/visual/position/position_flip.html
index 29ad32f96..66f0b243f 100644
--- a/tests/visual/position/position_flip.html
+++ b/tests/visual/position/position_flip.html
@@ -16,8 +16,8 @@
 		$("ul").insertAfter(inputs);
 		inputs.each(function(index) {
 			$(this).position({
-				my: this.id.replace(/-/, " "),
-				at: this.id.replace(/-/, " "),
+				my: $(this).data("position").replace(/-/, " "),
+				at: $(this).data("position").replace(/-/, " "),
 				of: "#container"+index,
 				collision: "none"
 			});
@@ -52,15 +52,15 @@
 <div id="container7" class="container" style="height:100px; margin-bottom: 500px;"></div>
 <div id="container8" class="container" style="height:100px; margin-bottom: 500px;"></div>
 
-<input id="left-top" />
-<input id="center-top" />
-<input id="right-top" />
-<input id="left-center" />
-<input id="center-center" />
-<input id="right-center" />
-<input id="left-bottom" />
-<input id="center-center" />
-<input id="right-bottom" />
+<input data-position="left-top" />
+<input data-position="center-top" />
+<input data-position="right-top" />
+<input data-position="left-center" />
+<input data-position="center-center" />
+<input data-position="right-center" />
+<input data-position="left-bottom" />
+<input data-position="center-center" />
+<input data-position="right-bottom" />
 
 <ul>
 	<li><a href="#">Java</a></li>
diff --git a/tests/visual/position/position_flipfit.html b/tests/visual/position/position_flipfit.html
index fb99e4007..5139b9b88 100644
--- a/tests/visual/position/position_flipfit.html
+++ b/tests/visual/position/position_flipfit.html
@@ -16,8 +16,8 @@
 		$("ul").insertAfter(inputs);
 		inputs.each(function(index) {
 			$(this).position({
-				my: this.id.replace(/-/, " "),
-				at: this.id.replace(/-/, " "),
+				my: $(this).data("position").replace(/-/, " "),
+				at: $(this).data("position").replace(/-/, " "),
 				of: "#container"+index,
 				collision: "none"
 			});
@@ -58,18 +58,18 @@
 <div id="container10" class="container" style="height:100px; margin-bottom: 500px;"></div>
 <div id="container11" class="container" style="height:100px; margin-bottom: 500px;"></div>
 
-<input id="left-top" />
-<input id="center-top" />
-<input id="right-top" />
-<input id="left-top" />
-<input id="center-top" />
-<input id="right-top" />
-<input id="left-center" />
-<input id="center-center" />
-<input id="right-center" />
-<input id="left-bottom" />
-<input id="center-center" />
-<input id="right-bottom" />
+<input data-position="left-top" />
+<input data-position="center-top" />
+<input data-position="right-top" />
+<input data-position="left-top" />
+<input data-position="center-top" />
+<input data-position="right-top" />
+<input data-position="left-center" />
+<input data-position="center-center" />
+<input data-position="right-center" />
+<input data-position="left-bottom" />
+<input data-position="center-center" />
+<input data-position="right-bottom" />
 
 <ul>
 	<li><a href="#">Java</a></li>
-- 
cgit v1.2.3


From 9938e999645e87b7abc9da072f98c290212c9e19 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 26 Apr 2012 20:16:06 +0200
Subject: Position: Fix markup for deprecated tests. Insert/remove some new
 lines to make comparision to position.html trivial

---
 tests/unit/position/position.html            |  9 +--------
 tests/unit/position/position_deprecated.html | 13 +++++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 2a6e43d36..25276f488 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -23,14 +23,7 @@
 	<script src="../swarminject.js"></script>
 </head>
 <body>
-<div style="position:relative; z-index:2;">
-	<h1 id="qunit-header">jQuery UI Position Test Suite</h1>
-	<h2 id="qunit-banner"></h2>
-	<div id="qunit-testrunner-toolbar"></div>
-	<h2 id="qunit-userAgent"></h2>
-	<ol id="qunit-tests">
-	</ol>
-</div>
+<div id="qunit" style="position:relative; z-index:2;"></div>
 
 <!--
 elements smaller than 10px have a line-height set on them to avoid a bug in IE6
diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index 8794812a8..5fc768459 100644
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -5,6 +5,9 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../jquery.js"></script>
+
+
+
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
@@ -17,16 +20,10 @@
 
 	<script src="position_core.js"></script>
 	<script src="position_deprecated.js"></script>
-
 	<script src="../swarminject.js"></script>
 </head>
 <body>
-
-<h1 id="qunit-header">jQuery UI Position Test Suite</h1>
-<h2 id="qunit-banner"></h2>
-<div id="qunit-testrunner-toolbar"></div>
-<h2 id="qunit-userAgent"></h2>
-<ol id="qunit-tests"></ol>
+<div id="qunit" style="position:relative; z-index:2;"></div>
 
 <!--
 elements smaller than 10px have a line-height set on them to avoid a bug in IE6
@@ -39,7 +36,7 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
 	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px;"></div>
 
-	<div style="position: absolute; top: 0px; left: 0px">
+	<div id="scrollx" style="position: absolute; top: 0px; left: 0px">
 		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
 		<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
 	</div>
-- 
cgit v1.2.3


From 24d06bfc4de591a3410873975a7813234a84712c Mon Sep 17 00:00:00 2001
From: "Richard D. Worth" <rdworth@gmail.com>
Date: Thu, 26 Apr 2012 14:37:52 -0400
Subject: Partial revert to fix IE6 regression in 258a637

---
 tests/unit/core/core.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/unit')

diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 09b024835..91595f4e1 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -61,7 +61,7 @@
 		<option>option</option>
 	</select>
 	<textarea id="visibleAncestor-textarea">x</textarea>
-	<object id="visibleAncestor-object" data="about:blank" type="text/html">xxx</object>
+	<object id="visibleAncestor-object" codebase="about:blank" data="about:blank" type="text/html">xxx</object>
 	<a href="#" id="visibleAncestor-anchorWithHref">anchor</a>
 	<a id="visibleAncestor-anchorWithoutHref">anchor</a>
 	<span id="visibleAncestor-span">x</span>
-- 
cgit v1.2.3


From 24d978f8331a0b4e3bc4dc35eaa88a7f9a47c5fd Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 Apr 2012 20:13:34 -0400
Subject: Core tests: Coding standards.

---
 tests/unit/core/core.js | 55 ++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 53415584f..79d1d4034 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -1,49 +1,44 @@
-/*
- * core unit tests
- */
-(function($) {
+(function( $ ) {
 
-module('core - jQuery extensions');
+module( "core - jQuery extensions" );
 
-test('focus - original functionality', function() {
-	expect(1);
-
-	$('#inputTabindex0')
+test( "focus - original functionality", function() {
+	expect( 1 );
+	$( "#inputTabindex0" )
 		.focus(function() {
-			ok(true, 'event triggered');
+			ok( true, "event triggered" );
 		})
 		.focus();
 });
 
-asyncTest('focus', function() {
-	expect(2);
-	$('#inputTabindex0')
+asyncTest( "focus", function() {
+	expect( 2 );
+	$( "#inputTabindex0" )
 		.focus(function() {
-			ok(true, 'event triggered');
+			ok( true, "event triggered" );
 		})
-		.focus(500, function() {
-			ok(true, 'callback triggered');
-			$(this).unbind('focus');
+		.focus( 500, function() {
+			ok( true, "callback triggered" );
 			start();
 		});
 });
 
-test('zIndex', function() {
-	var el = $('#zIndexAutoWithParent'),
+test( "zIndex", function() {
+	var el = $( "#zIndexAutoWithParent" ),
 		parent = el.parent();
-	equal(el.zIndex(), 100, 'zIndex traverses up to find value');
-	equal(parent.zIndex(200), parent, 'zIndex setter is chainable');
-	equal(el.zIndex(), 200, 'zIndex setter changed zIndex');
+	equal( el.zIndex(), 100, "zIndex traverses up to find value" );
+	equal( parent.zIndex(200 ), parent, "zIndex setter is chainable" );
+	equal( el.zIndex(), 200, "zIndex setter changed zIndex" );
 
-	el = $('#zIndexAutoWithParentViaCSS');
-	equal(el.zIndex(), 0, 'zIndex traverses up to find CSS value, not found because not positioned');
+	el = $( "#zIndexAutoWithParentViaCSS" );
+	equal( el.zIndex(), 0, "zIndex traverses up to find CSS value, not found because not positioned" );
 
-	el = $('#zIndexAutoWithParentViaCSSPositioned');
-	equal(el.zIndex(), 100, 'zIndex traverses up to find CSS value');
-	el.parent().zIndex(200);
-	equal(el.zIndex(), 200, 'zIndex setter changed zIndex, overriding CSS');
+	el = $( "#zIndexAutoWithParentViaCSSPositioned" );
+	equal( el.zIndex(), 100, "zIndex traverses up to find CSS value" );
+	el.parent().zIndex( 200 );
+	equal( el.zIndex(), 200, "zIndex setter changed zIndex, overriding CSS" );
 
-	equal($('#zIndexAutoNoParent').zIndex(), 0, 'zIndex never explicitly set in hierarchy');
+	equal( $( "#zIndexAutoNoParent" ).zIndex(), 0, "zIndex never explicitly set in hierarchy" );
 });
 
 test( "innerWidth - getter", function() {
@@ -154,4 +149,4 @@ test( "outerHeight(true) - setter", function() {
 	equal( el.height(), 32, "height set properly when hidden" );
 });
 
-})(jQuery);
+})( jQuery );
-- 
cgit v1.2.3


From 27072de09443eff51fdc6559658a7870c4d7824d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 Apr 2012 20:22:31 -0400
Subject: Tests: Run JSHint.

---
 tests/unit/core/core.js              |  2 ++
 tests/unit/effects/effects_core.js   |  8 +++++++-
 tests/unit/position/position_core.js |  2 ++
 tests/unit/testsuite.js              | 13 +++++++++----
 tests/unit/widget/widget_core.js     |  6 +++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 79d1d4034..099ac468c 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -2,6 +2,8 @@
 
 module( "core - jQuery extensions" );
 
+TestHelpers.testJshint( "ui.core" );
+
 test( "focus - original functionality", function() {
 	expect( 1 );
 	$( "#inputTabindex0" )
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 93c7da114..d3b5179e2 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -128,10 +128,16 @@ asyncTest( "animateClass: css and class changes during animation are not lost (#
 
 
 $.each( $.effects.effect, function( effect ) {
+	module( "effects." + effect );
+
+	// puff and size are defined inside scale
+	if ( effect !== "puff" && effect !== "size" ) {
+		TestHelpers.testJshint( "effects." + effect );
+	}
+
 	if ( effect === "transfer" ) {
 		return;
 	}
-	module( "effect."+effect );
 	asyncTest( "show/hide", function() {
 		expect( 8 );
 		var hidden = $( "div.hidden" ),
diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js
index e68e310f1..4a2240311 100644
--- a/tests/unit/position/position_core.js
+++ b/tests/unit/position/position_core.js
@@ -16,6 +16,8 @@ module( "position", {
 	}
 });
 
+TestHelpers.testJshint( "ui.position" );
+
 test( "my, at, of", function() {
 	expect( 4 );
 
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index faef90a9d..a6710930b 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -27,12 +27,17 @@ TestHelpers.loadResources = QUnit.urlParams.min ?
 	};
 
 QUnit.config.urlConfig.push( "nojshint" );
-function testJshint( widget ) {
+var jshintLoaded = false;
+TestHelpers.testJshint = function( module ) {
 	if ( QUnit.urlParams.nojshint ) {
 		return;
 	}
 
-	includeScript( "external/jshint.js" );
+	if ( !jshintLoaded ) {
+		includeScript( "external/jshint.js" );
+		jshintLoaded = true;
+	}
+
 	asyncTest( "JSHint", function() {
 		expect( 1 );
 
@@ -42,7 +47,7 @@ function testJshint( widget ) {
 				dataType: "json"
 			}),
 			$.ajax({
-				url: "../../../ui/jquery.ui." + widget + ".js",
+				url: "../../../ui/jquery." + module + ".js",
 				dataType: "text"
 			})
 		).done(function( hintArgs, srcArgs ) {
@@ -121,7 +126,7 @@ function testBasicUsage( widget ) {
 TestHelpers.commonWidgetTests = function( widget, settings ) {
 	module( widget + ": common widget" );
 
-	testJshint( widget );
+	TestHelpers.testJshint( "ui." + widget );
 	testWidgetDefaults( widget, settings.defaults );
 	testWidgetOverrides( widget );
 	testBasicUsage( widget );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 38495e282..aa70e2425 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -2,10 +2,14 @@
 
 module( "widget factory", {
 	teardown: function() {
-		delete $.ui.testWidget;
+		if ( $.ui ) {
+			delete $.ui.testWidget;
+		}
 	}
 });
 
+TestHelpers.testJshint( "ui.widget" );
+
 test( "widget creation", function() {
 	var myPrototype = {
 		_create: function() {},
-- 
cgit v1.2.3


From 1da2bf0daf68659c575c44e58807bc06e08e01be Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Mon, 30 Apr 2012 00:19:26 -0500
Subject: Tests: Linting

---
 tests/unit/testsuite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/unit')

diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index a6710930b..33a9a2c99 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -69,7 +69,7 @@ TestHelpers.testJshint = function( module ) {
 			start();
 		});
 	});
-}
+};
 
 function testWidgetDefaults( widget, defaults ) {
 	var pluginDefaults = $.ui[ widget ].prototype.options;
-- 
cgit v1.2.3


From fe55b6cddb00b85a56f9eb8f753b0535690d8b95 Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Mon, 30 Apr 2012 00:19:52 -0500
Subject: Effects: Updating unit tests to use some more stable logic hopefully

---
 tests/unit/effects/effects_core.js | 93 +++++++++++++++++++++++++++-----------
 ui/jquery.effects.core.js          | 19 ++++----
 2 files changed, 76 insertions(+), 36 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index d3b5179e2..e59a982c0 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -61,38 +61,79 @@ asyncTest( "animateClass works with borderStyle", function() {
 
 asyncTest( "animateClass works with colors", function() {
 	var test = $("div.animateClass"),
-		count = 0;
+		count = 0,
+		oldStep = jQuery.fx.step.backgroundColor;
 	expect(2);
-	test.toggleClass("testChangeBackground", duration, function() {
-		present( test.css("backgroundColor"), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
-		start();
+
+	// we want to catch the first frame of animation
+	jQuery.fx.step.backgroundColor = function( fx ) {
+		oldStep.apply( this, arguments );
+
+		// make sure it has animated somewhere we can detect
+		if ( fx.pos > 255 / 2000 ) {
+			jQuery.fx.step.backgroundColor = oldStep;
+			notPresent( test.css("backgroundColor"),
+				[ "#000000", "#ffffff", "#000", "#fff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
+				"Color is not endpoints in middle." );
+			test.stop( true, true );
+		}
+	};
+
+	test.toggleClass("testChangeBackground", {
+		duration: 2000,
+		complete: function() {
+			present( test.css("backgroundColor"), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
+			start();
+		}
 	});
-	setTimeout(function() {
-		var color = test.css("backgroundColor");
-		notPresent( color, [ "#000000", "#ffffff", "#000", "#fff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
-			"Color is not endpoints in middle." );
-	}, mid);
 });
 
-asyncTest( "animateClass works with children", function() {
-	var test = $("div.animateClass"),
-		h2 = test.find("h2");
+asyncTest( "animateClass calls step option", 1, function() {
+	var test = jQuery("div.animateClass"),
+		done = function() {
+			done = jQuery.noop;
+			test.stop();
+			start();
+		};
+	test.toggleClass( "testChangeBackground", {
+		step: function( fx ) {
+			ok( true, "Step Function Called" );
+			setTimeout( done, 0 );
+		}
+	});
+});
 
-	expect(4);
-	setTimeout(function() {
-		notPresent( h2.css("fontSize"), ["10px","20px"], "Font size is neither endpoint when in middle.");
-	}, mid);
-	test.toggleClass("testChildren", { children: true, duration: duration, complete: function() {
-		equal( h2.css("fontSize"), "20px", "Text size is final during complete");
-		test.toggleClass("testChildren", duration, function() {
-			equal( h2.css("fontSize"), "10px", "Text size revertted after class removed");
+asyncTest( "animateClass works with children", 3, function() {
+	var animatedChild,
+		test = $("div.animateClass"),
+		h2 = test.find("h2");
 
-			start();
-		});
-		setTimeout(function() {
-			equal( h2.css("fontSize"), "20px", "Text size unchanged during animate with children: undefined" );
-		}, mid);
-	}});
+	test.toggleClass("testChildren", {
+		children: true,
+		duration: duration,
+		complete: function() {
+			equal( h2.css("fontSize"), "20px", "Text size is final during complete");
+			test.toggleClass("testChildren", {
+				duration: duration,
+				complete: function() {
+					equal( h2.css("fontSize"), "10px", "Text size revertted after class removed");
+
+					start();
+				},
+				step: function( val, fx ) {
+					if ( fx.elem === h2[ 0 ] ) {
+						ok( false, "Error - Animating property on h2" );
+					}
+				}
+			});
+		},
+		step: function( val, fx ) {
+			if ( fx.prop === "fontSize" && fx.elem === h2[ 0 ] && !animatedChild ) {
+				equal( fx.end, 20, "animating font size on child" );
+				animatedChild = true;
+			}
+		}
+	});
 });
 
 asyncTest( "animateClass clears style properties when stopped", function() {
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index bac060067..edf9aa400 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -268,16 +268,15 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
 		// map all animated objects again - this time collecting a promise
 		allAnimations = allAnimations.map(function() {
 			var styleInfo = this,
-				dfd = $.Deferred();
-
-			this.el.animate( this.diff, {
-				duration: o.duration,
-				easing: o.easing,
-				queue: false,
-				complete: function() {
-					dfd.resolve( styleInfo );
-				}
-			});
+				dfd = $.Deferred(),
+				opts = jQuery.extend({}, o, {
+					queue: false,
+					complete: function() {
+						dfd.resolve( styleInfo )
+					}
+				});
+
+			this.el.animate( this.diff, opts );
 			return dfd.promise();
 		});
 
-- 
cgit v1.2.3


From aacdccc39438cda677343fb5a8c9faee37d8c18b Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Mon, 30 Apr 2012 01:05:30 -0500
Subject: Effects Tests: Disabling focus based test - need some help here
 @scottgonzalez

---
 tests/unit/effects/effects_core.js | 3 ++-
 ui/jquery.effects.core.js          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index e59a982c0..fc9f67d1b 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -31,6 +31,7 @@ test( "Immediate Return Conditions", function() {
 	equal( ++count, 3, "Both Functions worked properly" );
 });
 
+/* Disabled - Can't figure out why this is failing in IE 6/7
 test( "createWrapper and removeWrapper retain focused elements (#7595)", function() {
 	expect( 2 );
 	var test = $( "div.hidden" ).show(),
@@ -41,7 +42,7 @@ test( "createWrapper and removeWrapper retain focused elements (#7595)", functio
 	$.effects.removeWrapper( test );
 	equal( document.activeElement, input[ 0 ], "Active element is still input after removeWrapper" );
 });
-
+*/
 
 module( "effects.core: animateClass" );
 
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index edf9aa400..5cf95696d 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -272,7 +272,7 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
 				opts = jQuery.extend({}, o, {
 					queue: false,
 					complete: function() {
-						dfd.resolve( styleInfo )
+						dfd.resolve( styleInfo );
 					}
 				});
 
-- 
cgit v1.2.3


From fc3fc6ec2e9d8cf245c67e90668c1b1ee83f6d24 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 30 Apr 2012 08:42:01 -0400
Subject: Effects tests: Added TODO for disabled test.

---
 tests/unit/effects/effects_core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/unit')

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index fc9f67d1b..955e6f799 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -31,7 +31,7 @@ test( "Immediate Return Conditions", function() {
 	equal( ++count, 3, "Both Functions worked properly" );
 });
 
-/* Disabled - Can't figure out why this is failing in IE 6/7
+/* TODO: Disabled - Can't figure out why this is failing in IE 6/7
 test( "createWrapper and removeWrapper retain focused elements (#7595)", function() {
 	expect( 2 );
 	var test = $( "div.hidden" ).show(),
-- 
cgit v1.2.3


From f9e61eb61799faad3b215ed766f51bf79ef9b69f Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Mon, 30 Apr 2012 14:57:00 +0200
Subject: Fully revert breaking changes to core unit tests markup (htmllint
 ignores it now anyway).

Also update grunt.js: Simplify default task to finish that faster (also less console spam), remove beta from testswarm browserset, we don't need to test IE10 yet.
---
 grunt.js                  | 6 +++---
 tests/unit/core/core.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/unit')

diff --git a/grunt.js b/grunt.js
index a19e35f5f..7e13bec4a 100644
--- a/grunt.js
+++ b/grunt.js
@@ -370,7 +370,7 @@ grunt.registerTask( "testswarm", function( commit, authToken ) {
 	}
 	testswarm({
 		url: "http://swarm.jquery.org/",
-		pollInterval: 5000,
+		pollInterval: 10000,
 		done: this.async()
 	}, {
 		authUsername: "jqueryui",
@@ -379,7 +379,7 @@ grunt.registerTask( "testswarm", function( commit, authToken ) {
 		runMax: 4,
 		"runNames[]": Object.keys(tests),
 		"runUrls[]": testUrls,
-		"browserSets[]": ["popular", "beta"]
+		"browserSets[]": ["popular"]
 	});
 });
 
@@ -566,7 +566,7 @@ grunt.registerTask( "clean", function() {
 	require( "rimraf" ).sync( "dist" );
 });
 
-grunt.registerTask( "default", "lint csslint htmllint qunit build compare_size" );
+grunt.registerTask( "default", "lint csslint htmllint qunit" );
 grunt.registerTask( "sizer", "concat:ui min:dist/jquery-ui.min.js compare_size:all" );
 grunt.registerTask( "sizer_all", "concat:ui min compare_size" );
 grunt.registerTask( "build", "concat min cssmin" );
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 91595f4e1..e259f3270 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -61,7 +61,7 @@
 		<option>option</option>
 	</select>
 	<textarea id="visibleAncestor-textarea">x</textarea>
-	<object id="visibleAncestor-object" codebase="about:blank" data="about:blank" type="text/html">xxx</object>
+	<object id="visibleAncestor-object" codebase="about:blank">xxx</object>
 	<a href="#" id="visibleAncestor-anchorWithHref">anchor</a>
 	<a id="visibleAncestor-anchorWithoutHref">anchor</a>
 	<span id="visibleAncestor-span">x</span>
-- 
cgit v1.2.3


From 96510ea6ccb8eb091ff625a4875e06f8cadfb8ac Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Fri, 4 May 2012 17:14:56 +0200
Subject: Core tests: Fix double focus in IE

---
 tests/unit/core/core.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/unit')

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 099ac468c..7a78ae34d 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -20,6 +20,8 @@ asyncTest( "focus", function() {
 			ok( true, "event triggered" );
 		})
 		.focus( 500, function() {
+			// prevent double focus event in IE
+			$( this ).unbind( "focus" );
 			ok( true, "callback triggered" );
 			start();
 		});
-- 
cgit v1.2.3


From dec5b4889850923b366ef54a40d568f28d5dd8d2 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 4 May 2012 11:21:38 -0400
Subject: Tabs tests: Work around IE quirks.

---
 tests/unit/tabs/tabs_deprecated.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 8d3685b3d..66768b866 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -394,10 +394,15 @@ test( "select", function() {
 module( "tabs (deprecated): methods" );
 
 test( "add", function() {
-	expect( 27 );
+	expect( 28 );
 
 	var tab, anchor,
 		element = $( "#tabs1" ).tabs();
+
+	function stripLeadingSlash( str ) {
+		return str.substr( str.charAt( 0 ) === "/" ? 1 : 0 );
+	}
+
 	state( element, 1, 0, 0 );
 
 	// add without index
@@ -411,7 +416,8 @@ test( "add", function() {
 	tab = element.find( ".ui-tabs-nav li" ).last();
 	anchor = tab.find( "a" );
 	equal( tab.text(), "New", "label" );
-	equal( anchor.attr( "href" ), "#new", "href" );
+	equal( stripLeadingSlash( anchor[0].pathname ), stripLeadingSlash( location.pathname ), "href pathname" );
+	equal( anchor[0].hash, "#new", "href hash" );
 	equal( anchor.attr( "aria-controls" ), "new", "aria-controls" );
 	ok( !tab.hasClass( "ui-state-hover" ), "not hovered" );
 	anchor.simulate( "mouseover" );
@@ -430,7 +436,9 @@ test( "add", function() {
 	tab = element.find( ".ui-tabs-nav li" ).eq( 1 );
 	anchor = tab.find( "a" );
 	equal( tab.text(), "New Remote", "label" );
-	equal( anchor.attr( "href" ), "data/test.html", "href" );
+	equal( stripLeadingSlash( stripLeadingSlash(
+		anchor[0].pathname.replace( stripLeadingSlash( location.pathname ).split( "/" ).slice( 0, -1 ).join( "/" ), "" )
+	) ), "data/test.html", "href" );
 	ok( /^ui-tabs-\d+$/.test( anchor.attr( "aria-controls" ) ), "aria controls" );
 	ok( !tab.hasClass( "ui-state-hover" ), "not hovered" );
 	anchor.simulate( "mouseover" );
@@ -573,6 +581,10 @@ asyncTest( "abort", function() {
 			start();
 		});
 	});
+	// prevent IE from caching the request, so that it won't resolve before we call abort
+	element.find( ".ui-tabs-nav li:eq(2) a" ).attr( "href", function( href ) {
+		return href + "?" + (+ new Date());
+	});
 	element.tabs( "option", "active", 2 );
 	element.tabs( "abort" );
 });
-- 
cgit v1.2.3


From cba2b6c74fe08e53647af7c5125cbbcd3b4d1941 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 4 May 2012 20:54:27 -0400
Subject: Position tests: Work around IE6 bug with forced heights on small
 elements.

---
 tests/unit/position/position.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 25276f488..8738ae667 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -26,7 +26,7 @@
 <div id="qunit" style="position:relative; z-index:2;"></div>
 
 <!--
-elements smaller than 10px have a line-height set on them to avoid a bug in IE6
+elements smaller than 20px have a line-height set on them to avoid a bug in IE6
 .height() returns the greater of the height and line-height
 -->
 
@@ -34,7 +34,7 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 	<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
 	<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
 	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
-	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px;"></div>
+	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px; line-height: 12px;"></div>
 
 	<div id="scrollx" style="position: absolute; top: 0px; left: 0px">
 		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-- 
cgit v1.2.3


From a0c734b9e1d773167f3c9a84df851f4ae7faba87 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Mon, 7 May 2012 12:19:19 +0200
Subject: Position: Apply IE6 line-height workaround to deprecated tests, too

---
 tests/unit/position/position_deprecated.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index 5fc768459..84aae61f8 100644
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -26,7 +26,7 @@
 <div id="qunit" style="position:relative; z-index:2;"></div>
 
 <!--
-elements smaller than 10px have a line-height set on them to avoid a bug in IE6
+elements smaller than 20px have a line-height set on them to avoid a bug in IE6
 .height() returns the greater of the height and line-height
 -->
 
@@ -34,7 +34,7 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6
 	<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
 	<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
 	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
-	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px;"></div>
+	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px; line-height: 12px;"></div>
 
 	<div id="scrollx" style="position: absolute; top: 0px; left: 0px">
 		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-- 
cgit v1.2.3


From cab4c467d9c12ec61a652c3bf68eedd166319b34 Mon Sep 17 00:00:00 2001
From: Jay Merrifield <fracmak@gmail.com>
Date: Thu, 3 May 2012 19:02:23 -0400
Subject: Dialog: Handle escape for all overlays. Fixes #8300 - Dialog:
 Incorrect behavior for ESCAPE with multiple modal dialogs.

---
 tests/unit/dialog/dialog_tickets.js | 62 +++++++++++++++++++++++++++++++++----
 ui/jquery.ui.dialog.js              | 26 +++++++++-------
 2 files changed, 71 insertions(+), 17 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/dialog/dialog_tickets.js b/tests/unit/dialog/dialog_tickets.js
index a169bd1a5..98983cf33 100644
--- a/tests/unit/dialog/dialog_tickets.js
+++ b/tests/unit/dialog/dialog_tickets.js
@@ -117,26 +117,76 @@ test("#6645: Missing element not found check in overlay", function(){
 });
 
 test("#6966: Escape key closes all dialogs, not the top one", function(){
-	expect(8);
-    // test with close function removing dialog
-    d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
+	expect(24);
+    // test with close function removing dialog triggered through the overlay
+    d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true, close: function(){ d1.remove(); }});
+    d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
+
+    ok(d1.data('dialog') && d1.dialog('isOpen'), 'first dialog is open');
+    ok(d2.data('dialog') && d2.dialog('isOpen'), 'second dialog is open');
+    
+    $( document ).simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
+    ok(d1.data('dialog') && d1.dialog('isOpen'), 'first dialog still open');
+    ok(!d2.data('dialog'), 'second dialog is closed');
+
+    $( document ).simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
+    ok(!d1.data('dialog'), 'first dialog is closed');
+    ok(!d2.data('dialog'), 'second dialog is closed');
+
+    d2.remove();
+    d1.remove();
+    
+	// test with close function removing dialog triggered through the dialog
+    d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true, close: function(){ d1.remove(); }});
     d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
+
+    ok(d1.data('dialog') && d1.dialog('isOpen'), 'first dialog is open');
+    ok(d2.data('dialog') && d2.dialog('isOpen'), 'second dialog is open');
+    
+    d2.simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
+    ok(d1.data('dialog') && d1.dialog('isOpen'), 'first dialog still open');
+    ok(!d2.data('dialog'), 'second dialog is closed');
+
+    d1.simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
+    ok(!d1.data('dialog'), 'first dialog is closed');
+    ok(!d2.data('dialog'), 'second dialog is closed');
+
+    d2.remove();
+    d1.remove();
+
+    // test without close function removing dialog
+    d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
+    d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true});
+
     ok(d1.dialog("isOpen"), 'first dialog is open');
     ok(d2.dialog("isOpen"), 'second dialog is open');
+
     d2.simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
     ok(d1.dialog("isOpen"), 'first dialog still open');
-    ok(!d2.data('dialog'), 'second dialog is closed');
+    ok(!d2.dialog("isOpen"), 'second dialog is closed');
+
+    d1.simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+    ok(!d1.dialog("isOpen"), 'first dialog is closed');
+    ok(!d2.dialog("isOpen"), 'second dialog is closed');
+
     d2.remove();
     d1.remove();
 
-    // test without close function removing dialog
+    // test without close function removing dialog triggered through the overlay
     d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
     d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true});
+
     ok(d1.dialog("isOpen"), 'first dialog is open');
     ok(d2.dialog("isOpen"), 'second dialog is open');
-    d2.simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+
+    $( document ).simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
     ok(d1.dialog("isOpen"), 'first dialog still open');
     ok(!d2.dialog("isOpen"), 'second dialog is closed');
+
+    $( document ).simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+    ok(!d1.dialog("isOpen"), 'first dialog is closed');
+    ok(!d2.dialog("isOpen"), 'second dialog is closed');
+
     d2.remove();
     d1.remove();
 });
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 144cf9725..45ee37789 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -713,21 +713,25 @@ $.extend( $.ui.dialog.overlay, {
 				}
 			}, 1 );
 
-			// allow closing by pressing the escape key
-			$( document ).bind( "keydown.dialog-overlay", function( event ) {
-				if ( dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-					event.keyCode === $.ui.keyCode.ESCAPE ) {
-
-					dialog.close( event );
-					event.preventDefault();
-				}
-			});
-
 			// handle window resize
 			$( window ).bind( "resize.dialog-overlay", $.ui.dialog.overlay.resize );
 		}
-
+		
 		var $el = ( this.oldInstances.pop() || $( "<div>" ).addClass( "ui-widget-overlay" ) );
+		
+		// allow closing by pressing the escape key
+		$( document ).bind( "keydown.dialog-overlay", function( event ) {
+			var instances = $.ui.dialog.overlay.instances; 
+			// only react to the event if we're the top overlay 
+			if ( instances.length !== 0 && instances[ instances.length - 1 ] === $el && 
+				dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
+				event.keyCode === $.ui.keyCode.ESCAPE ) {
+	
+				dialog.close( event );
+				event.preventDefault();
+			}
+		});
+
 		$el.appendTo( document.body ).css({
 			width: this.width(),
 			height: this.height()
-- 
cgit v1.2.3


From d393c8b4cb26ec34878c22202da6ba9393e0094d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 10 May 2012 17:59:55 -0400
Subject: Spinner: Handle async focus events in IE. Fixes incorrect detection
 of changes.

---
 tests/unit/spinner/spinner_events.js | 96 +++++++++++++++++++-----------------
 ui/jquery.ui.spinner.js              | 42 ++++++++++++++--
 2 files changed, 90 insertions(+), 48 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js
index 133a8d5a2..72b185528 100644
--- a/tests/unit/spinner/spinner_events.js
+++ b/tests/unit/spinner/spinner_events.js
@@ -121,7 +121,7 @@ test( "stop", function() {
 	element.spinner( "value", 999 );
 });
 
-test( "change", function() {
+asyncTest( "change", function() {
 	expect( 14 );
 	var element = $( "#spin" ).spinner();
 
@@ -174,50 +174,56 @@ test( "change", function() {
 	shouldChange( false, "button up, before blur" );
 	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
 	shouldChange( true, "blur after button up" );
-	element.blur();
-
-	shouldChange( false, "button down, before blur" );
-	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-	shouldChange( true, "blur after button down" );
-	element.blur();
-
-	shouldChange( false, "many buttons, same final value, before blur" );
-	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-	element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
-	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-	element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
-	shouldChange( false, "blur after many buttons, same final value" );
-	element.blur();
-
-	shouldChange( true, "stepUp" );
-	element.spinner( "stepUp" );
-
-	shouldChange( true, "stepDown" );
-	element.spinner( "stepDown" );
-
-	shouldChange( true, "pageUp" );
-	element.spinner( "pageUp" );
-
-	shouldChange( true, "pageDown" );
-	element.spinner( "pageDown" );
-
-	shouldChange( true, "value" );
-	element.spinner( "value", 999 );
-
-	shouldChange( false, "value, same value" );
-	element.spinner( "value", 999 );
-
-	shouldChange( true, "max, value changed" );
-	element.spinner( "option", "max", 900 );
-
-	shouldChange( false, "max, value not changed" );
-	element.spinner( "option", "max", 1000 );
-
-	shouldChange( true, "min, value changed" );
-	element.spinner( "option", "min", 950 );
-
-	shouldChange( false, "min, value not changed" );
-	element.spinner( "option", "min", 200 );
+	setTimeout(function() {
+		element.blur();
+
+		shouldChange( false, "button down, before blur" );
+		element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+		shouldChange( true, "blur after button down" );
+		setTimeout(function() {
+			element.blur();
+
+			shouldChange( false, "many buttons, same final value, before blur" );
+			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+			element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
+			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+			element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
+			shouldChange( false, "blur after many buttons, same final value" );
+			element.blur();
+			setTimeout(function() {
+				shouldChange( true, "stepUp" );
+				element.spinner( "stepUp" );
+
+				shouldChange( true, "stepDown" );
+				element.spinner( "stepDown" );
+
+				shouldChange( true, "pageUp" );
+				element.spinner( "pageUp" );
+
+				shouldChange( true, "pageDown" );
+				element.spinner( "pageDown" );
+
+				shouldChange( true, "value" );
+				element.spinner( "value", 999 );
+
+				shouldChange( false, "value, same value" );
+				element.spinner( "value", 999 );
+
+				shouldChange( true, "max, value changed" );
+				element.spinner( "option", "max", 900 );
+
+				shouldChange( false, "max, value not changed" );
+				element.spinner( "option", "max", 1000 );
+
+				shouldChange( true, "min, value changed" );
+				element.spinner( "option", "min", 950 );
+
+				shouldChange( false, "min, value not changed" );
+				element.spinner( "option", "min", 200 );
+				start();
+			});
+		});
+	});
 });
 
 })( jQuery );
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index bd55a09ea..1e4204a0c 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -93,6 +93,11 @@ $.widget( "ui.spinner", {
 			this.previous = this.element.val();
 		},
 		blur: function( event ) {
+			if ( this.cancelBlur ) {
+				delete this.cancelBlur;
+				return;
+			}
+
 			this._refresh();
 			this.uiSpinner.removeClass( "ui-state-active" );
 			if ( this.previous !== this.element.val() ) {
@@ -117,11 +122,42 @@ $.widget( "ui.spinner", {
 			event.preventDefault();
 		},
 		"mousedown .ui-spinner-button": function( event ) {
+			var previous;
+
+			// We never want the buttons to have focus; whenever the user is
+			// interacting with the spinner, the focus should be on the input.
+			// If the input is focused then this.previous is properly set from
+			// when the input first received focus. If the input is not focused
+			// then we need to set this.previous based on the value before spinning.
+			previous = this.element[0] === this.document[0].activeElement ?
+				this.previous : this.element.val();
+			function checkFocus() {
+				var isActive = this.element[0] === this.document[0].activeElement;
+				if ( !isActive ) {
+					this.element.focus();
+					this.previous = previous;
+					// support: IE
+					// IE sets focus asynchronously, so we need to check if focus
+					// moved off of the input because the user clicked on the button.
+					this._delay(function() {
+						this.previous = previous;
+					});
+				}
+			}
+
 			// ensure focus is on (or stays on) the text field
 			event.preventDefault();
-			if ( this.document[0].activeElement !== this.element[ 0 ] ) {
-				this.element.focus();
-			}
+			checkFocus.call( this );
+
+			// support: IE
+			// IE doesn't prevent moving focus even with event.preventDefault()
+			// so we set a flag to know when we should ignore the blur event
+			// and check (again) if focus moved off of the input.
+			this.cancelBlur = true;
+			this._delay(function() {
+				delete this.cancelBlur;
+				checkFocus.call( this );
+			});
 
 			if ( this._start( event ) === false ) {
 				return;
-- 
cgit v1.2.3