Datepicker: Convert tests to new infrastructure

Ref #10119
Ref gh-1528

1 files changed, 25 insertions, 24 deletions

diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index e52e126d2..c16376880 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -1,72 +1,73 @@
-/*
- * datepicker_methods.js
- */
-(function($) {
+define( [
+	"jquery",
+	"./datepicker_test_helpers",
+	"ui/datepicker"
+], function( $, datepickerTestHelpers ) {
 
 module("datepicker: methods");
 
 test("destroy", function() {
 	expect( 33 );
 	var inl,
-		inp = TestHelpers.datepicker.init("#inp");
+		inp = datepickerTestHelpers.init("#inp");
 	ok(inp.is(".hasDatepicker"), "Default - marker class set");
-	ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Default - instance present");
+	ok($.data(inp[0], datepickerTestHelpers.PROP_NAME), "Default - instance present");
 	ok(inp.next().is("#alt"), "Default - button absent");
 	inp.datepicker("destroy");
 	inp = $("#inp");
 	ok(!inp.is(".hasDatepicker"), "Default - marker class cleared");
-	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Default - instance absent");
+	ok(!$.data(inp[0], datepickerTestHelpers.PROP_NAME), "Default - instance absent");
 	ok(inp.next().is("#alt"), "Default - button absent");
 	// With button
-	inp= TestHelpers.datepicker.init("#inp", {showOn: "both"});
+	inp= datepickerTestHelpers.init("#inp", {showOn: "both"});
 	ok(inp.is(".hasDatepicker"), "Button - marker class set");
-	ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Button - instance present");
+	ok($.data(inp[0], datepickerTestHelpers.PROP_NAME), "Button - instance present");
 	ok(inp.next().text() === "...", "Button - button added");
 	inp.datepicker("destroy");
 	inp = $("#inp");
 	ok(!inp.is(".hasDatepicker"), "Button - marker class cleared");
-	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Button - instance absent");
+	ok(!$.data(inp[0], datepickerTestHelpers.PROP_NAME), "Button - instance absent");
 	ok(inp.next().is("#alt"), "Button - button removed");
 	// With append text
-	inp = TestHelpers.datepicker.init("#inp", {appendText: "Testing"});
+	inp = datepickerTestHelpers.init("#inp", {appendText: "Testing"});
 	ok(inp.is(".hasDatepicker"), "Append - marker class set");
-	ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Append - instance present");
+	ok($.data(inp[0], datepickerTestHelpers.PROP_NAME), "Append - instance present");
 	ok(inp.next().text() === "Testing", "Append - append text added");
 	inp.datepicker("destroy");
 	inp = $("#inp");
 	ok(!inp.is(".hasDatepicker"), "Append - marker class cleared");
-	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Append - instance absent");
+	ok(!$.data(inp[0], datepickerTestHelpers.PROP_NAME), "Append - instance absent");
 	ok(inp.next().is("#alt"), "Append - append text removed");
 	// With both
-	inp= TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImageOnly: true,
+	inp= datepickerTestHelpers.init("#inp", {showOn: "both", buttonImageOnly: true,
 		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($.data(inp[0], datepickerTestHelpers.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");
 	inp.datepicker("destroy");
 	inp = $("#inp");
 	ok(!inp.is(".hasDatepicker"), "Both - marker class cleared");
-	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Both - instance absent");
+	ok(!$.data(inp[0], datepickerTestHelpers.PROP_NAME), "Both - instance absent");
 	ok(inp.next().is("#alt"), "Both - button and append text absent");
 	// Inline
-	inl = TestHelpers.datepicker.init("#inl");
+	inl = datepickerTestHelpers.init("#inl");
 	ok(inl.is(".hasDatepicker"), "Inline - marker class set");
 	ok(inl.html() !== "", "Inline - datepicker present");
-	ok($.data(inl[0], TestHelpers.datepicker.PROP_NAME), "Inline - instance present");
+	ok($.data(inl[0], datepickerTestHelpers.PROP_NAME), "Inline - instance present");
 	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(!$.data(inl[0], TestHelpers.datepicker.PROP_NAME), "Inline - instance absent");
+	ok(!$.data(inl[0], datepickerTestHelpers.PROP_NAME), "Inline - instance absent");
 	ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
 });
 
 test("enableDisable", function() {
 	expect( 33 );
 	var inl, dp,
-		inp = TestHelpers.datepicker.init("#inp");
+		inp = datepickerTestHelpers.init("#inp");
 	ok(!inp.datepicker("isDisabled"), "Enable/disable - initially marked as enabled");
 	ok(!inp[0].disabled, "Enable/disable - field initially enabled");
 	inp.datepicker("disable");
@@ -77,7 +78,7 @@ test("enableDisable", function() {
 	ok(!inp[0].disabled, "Enable/disable - field now enabled");
 	inp.datepicker("destroy");
 	// With a button
-	inp = TestHelpers.datepicker.init("#inp", {showOn: "button"});
+	inp = datepickerTestHelpers.init("#inp", {showOn: "button"});
 	ok(!inp.datepicker("isDisabled"), "Enable/disable button - initially marked as enabled");
 	ok(!inp[0].disabled, "Enable/disable button - field initially enabled");
 	ok(!inp.next("button")[0].disabled, "Enable/disable button - button initially enabled");
@@ -91,7 +92,7 @@ test("enableDisable", function() {
 	ok(!inp.next("button")[0].disabled, "Enable/disable button - button now enabled");
 	inp.datepicker("destroy");
 	// With an image button
-	inp = TestHelpers.datepicker.init("#inp", {showOn: "button", buttonImageOnly: true,
+	inp = datepickerTestHelpers.init("#inp", {showOn: "button", buttonImageOnly: true,
 		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");
@@ -106,7 +107,7 @@ test("enableDisable", function() {
 	ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image now enabled");
 	inp.datepicker("destroy");
 	// Inline
-	inl = TestHelpers.datepicker.init("#inl", {changeYear: true});
+	inl = datepickerTestHelpers.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");
@@ -122,4 +123,4 @@ test("enableDisable", function() {
 	inl.datepicker("destroy");
 });
 
-})(jQuery);
+} );