Merge branch 'master' into selectmenu

6 files changed, 13 insertions, 17 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