Merge branch 'master' into selectmenu

13 files changed, 66 insertions, 29 deletions

diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 390d052c3..8ef2de5a4 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -22,8 +22,8 @@
 	});
 	</script>
 
+	<script src="datepicker_common.js"></script>
 	<script src="datepicker_core.js"></script>
-	<script src="datepicker_defaults.js"></script>
 	<script src="datepicker_events.js"></script>
 	<script src="datepicker_methods.js"></script>
 	<script src="datepicker_options.js"></script>
diff --git a/tests/unit/datepicker/datepicker_common.js b/tests/unit/datepicker/datepicker_common.js
new file mode 100644
index 000000000..1eecc85cb
--- /dev/null
+++ b/tests/unit/datepicker/datepicker_common.js
@@ -0,0 +1,7 @@
+/*
+TestHelpers.commonWidgetTests( "datepicker", {
+	defaults: {
+		disabled: false
+	}
+});
+*/
diff --git a/tests/unit/datepicker/datepicker_defaults.js b/tests/unit/datepicker/datepicker_defaults.js
deleted file mode 100644
index 1e7d90852..000000000
--- a/tests/unit/datepicker/datepicker_defaults.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * datepicker_defaults.js
- */
-
-/*
-var datepicker_defaults = {
-	disabled: false
-};
-
-TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults });
-*/
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index 77217e449..e52e126d2 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -39,7 +39,7 @@ test("destroy", function() {
 	ok(inp.next().is("#alt"), "Append - append text removed");
 	// With both
 	inp= TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImageOnly: true,
-		buttonImage: "img/calendar.gif", appendText: "Testing"});
+		buttonImage: "images/calendar.gif", appendText: "Testing"});
 	ok(inp.is(".hasDatepicker"), "Both - marker class set");
 	ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Both - instance present");
 	ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
@@ -92,7 +92,7 @@ test("enableDisable", function() {
 	inp.datepicker("destroy");
 	// With an image button
 	inp = TestHelpers.datepicker.init("#inp", {showOn: "button", buttonImageOnly: true,
-		buttonImage: "img/calendar.gif"});
+		buttonImage: "images/calendar.gif"});
 	ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
 	ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
 	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 5603dc87b..e47235786 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -145,13 +145,13 @@ asyncTest("invocation", function() {
 	function step3() {
 		// On image button
 		inp = TestHelpers.datepicker.init("#inp", {showOn: "button", buttonImageOnly: true,
-			buttonImage: "img/calendar.gif", buttonText: "Cal"});
+			buttonImage: "images/calendar.gif", buttonText: "Cal"});
 		ok(!dp.is(":visible"), "Image button - initially hidden");
 		button = inp.siblings("button");
 		ok(button.length === 0, "Image button - button absent");
 		image = inp.siblings("img");
 		ok(image.length === 1, "Image button - image present");
-		equal(image.attr("src"), "img/calendar.gif", "Image button - image source");
+		equal(image.attr("src"), "images/calendar.gif", "Image button - image source");
 		equal(image.attr("title"), "Cal", "Image button - image text");
 		inp[0].focus();
 		setTimeout(function() {
@@ -168,7 +168,7 @@ asyncTest("invocation", function() {
 
 	function step4() {
 		// On both
-		inp = TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImage: "img/calendar.gif"});
+		inp = TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImage: "images/calendar.gif"});
 		ok(!dp.is(":visible"), "Both - initially hidden");
 		button = inp.siblings("button");
 		ok(button.length === 1, "Both - button present");
diff --git a/tests/unit/datepicker/images/calendar.gif b/tests/unit/datepicker/images/calendar.gif
new file mode 100644
index 000000000..d0abaa7c0
--- /dev/null
+++ b/tests/unit/datepicker/images/calendar.gif
diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js
index 34fd20564..7c6961af2 100644
--- a/tests/unit/draggable/draggable_common.js
+++ b/tests/unit/draggable/draggable_common.js
@@ -6,7 +6,6 @@ TestHelpers.commonWidgetTests( "draggable", {
 		cancel: "input,textarea,button,select,option",
 		connectToSortable: false,
 		containment: false,
-		create: null,
 		cursor: "auto",
 		cursorAt: false,
 		delay: 0,
@@ -28,6 +27,12 @@ TestHelpers.commonWidgetTests( "draggable", {
 		snapMode: "both",
 		snapTolerance: 20,
 		stack: false,
-		zIndex: false
+		zIndex: false,
+
+		// callbacks
+		create: null,
+		drag: null,
+		start: null,
+		stop: null
 	}
 });
diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js
index d86afe3dd..c112def3c 100644
--- a/tests/unit/droppable/droppable_common.js
+++ b/tests/unit/droppable/droppable_common.js
@@ -3,11 +3,18 @@ TestHelpers.commonWidgetTests( "droppable", {
 		accept: "*",
 		activeClass: false,
 		addClasses: true,
-		create: null,
 		disabled: false,
 		greedy: false,
 		hoverClass: false,
 		scope: "default",
-		tolerance: "intersect"
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		create: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
 	}
 });
diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js
index 6758214ad..c261ac5b9 100644
--- a/tests/unit/resizable/resizable_common.js
+++ b/tests/unit/resizable/resizable_common.js
@@ -1,4 +1,4 @@
-TestHelpers.commonWidgetTests("resizable", {
+TestHelpers.commonWidgetTests( "resizable", {
 	defaults: {
 		alsoResize: false,
 		animate: false,
@@ -22,6 +22,9 @@ TestHelpers.commonWidgetTests("resizable", {
 		zIndex: 90,
 
 		// callbacks
-		create: null
+		create: null,
+		resize: null,
+		start: null,
+		stop: null
 	}
 });
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
index 00bbedc61..d00a47be5 100644
--- a/tests/unit/selectable/selectable_common.js
+++ b/tests/unit/selectable/selectable_common.js
@@ -3,11 +3,19 @@ TestHelpers.commonWidgetTests("selectable", {
 		appendTo: "body",
 		autoRefresh: true,
 		cancel: "input,textarea,button,select,option",
-		create: null,
 		delay: 0,
 		disabled: false,
 		distance: 0,
 		filter: "*",
-		tolerance: "touch"
+		tolerance: "touch",
+
+		// callbacks
+		create: null,
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
 	}
 });
diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js
index 48fd5e457..6d7278de6 100644
--- a/tests/unit/slider/slider_common.js
+++ b/tests/unit/slider/slider_common.js
@@ -14,6 +14,10 @@ TestHelpers.commonWidgetTests( "slider", {
 		values: null,
 
 		// callbacks
-		create: null
+		create: null,
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
 	}
 });
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index 9736cf9ee..c23a15854 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -11,7 +11,7 @@
 	<script src="../testsuite.js"></script>
 	<script>
 	TestHelpers.loadResources({
-		css: [ "ui.core", "ui.sortable" ],
+		css: [ "ui.core" ],
 		js: [
 			"ui/jquery.ui.core.js",
 			"ui/jquery.ui.widget.js",
diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js
index 0a8e9f2b9..86850a658 100644
--- a/tests/unit/sortable/sortable_common.js
+++ b/tests/unit/sortable/sortable_common.js
@@ -5,7 +5,6 @@ TestHelpers.commonWidgetTests( "sortable", {
 		cancel: "input,textarea,button,select,option",
 		connectWith: false,
 		containment: false,
-		create: null,
 		cursor: "auto",
 		cursorAt: false,
 		delay: 0,
@@ -26,6 +25,21 @@ TestHelpers.commonWidgetTests( "sortable", {
 		scrollSpeed: 20,
 		scope: "default",
 		tolerance: "intersect",
-		zIndex: 1000
+		zIndex: 1000,
+
+		// callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		create: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
 	}
 });