Dev: remove globals from tests and moved test helpers to correct location - Fixed #8770 Dev: Remove globals and Standardize Test Suite

Author: mikesherov

tests/.jshintrc

@@ -14,35 +14,20 @@
 	"unused": true,
 	"predef": [
 		"asyncTest",
-		"container",
 		"deepEqual",
-		"d1",
-		"d2",
-		"dlg",
 		"domEqual",
-		"drag",
-		"dragged",
-		"el",
 		"equal",
-		"equalsDate",
 		"expect",
 		"Globalize",
-		"heightAfter",
-		"init",
-		"modal",
 		"module",
-		"moved",
 		"notEqual",
-		"offsetAfter",
-		"offsetBefore",
 		"ok",
 		"QUnit",
 		"start",
 		"strictEqual",
 		"stop",
 		"test",
 		"TestHelpers",
-		"widthAfter",
 		"JSHINT"
 	]
 }

tests/unit/datepicker/datepicker.html

@@ -27,6 +27,7 @@
 	<script src="datepicker_events.js"></script>
 	<script src="datepicker_methods.js"></script>
 	<script src="datepicker_options.js"></script>
+	<script src="datepicker_test_helpers.js"></script>
 	<script src="datepicker_tickets.js"></script>
 
 	<script src="../swarminject.js"></script>

tests/unit/datepicker/datepicker_core.js

@@ -24,13 +24,13 @@ function callback2(year, month, inst) {
 test('events', function() {
 	expect( 26 );
 	var dateStr, newMonthYear, inp2,
-		inp = init('#inp', {onSelect: callback}),
+		inp = TestHelpers.datepicker.init('#inp', {onSelect: callback}),
 	date = new Date();
 	// onSelect
 	inp.val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	equal(selectedThis, inp[0], 'Callback selected this');
-	equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback selected inst');
+	equal(selectedInst, $.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Callback selected inst');
 	equal(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
 		'Callback selected date');
 	inp.val('').datepicker('show').
@@ -59,7 +59,7 @@ test('events', function() {
 	inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_UP});
 	date.setMonth(date.getMonth() - 1);
 	equal(selectedThis, inp[0], 'Callback change month/year this');
-	equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback change month/year inst');
+	equal(selectedInst, $.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Callback change month/year inst');
 	equal(selectedDate, newMonthYear(date),
 		'Callback change month/year date - pgup');
 	inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_DOWN});
@@ -107,7 +107,7 @@ test('events', function() {
 		val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE});
 	equal(selectedThis, inp[0], 'Callback close this');
-	equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback close inst');
+	equal(selectedInst, $.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Callback close inst');
 	equal(selectedDate, '', 'Callback close date - esc');
 	inp.val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
@@ -120,7 +120,7 @@ test('events', function() {
 		simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.END});
 	equal(selectedDate, '', 'Callback close date - ctrl+end');
 
-	inp2 = init('#inp2');
+	inp2 = TestHelpers.datepicker.init('#inp2');
 	inp2.datepicker().datepicker('option', {onClose: callback}).datepicker('show');
 	inp.datepicker('show');
 	equal(selectedThis, inp2[0], 'Callback close this');

tests/unit/datepicker/datepicker_events.js

@@ -8,65 +8,65 @@ module("datepicker: methods");
 test('destroy', function() {
 	expect( 33 );
 	var inl,
-		inp = init('#inp');
+		inp = TestHelpers.datepicker.init('#inp');
 	ok(inp.is('.hasDatepicker'), 'Default - marker class set');
-	ok($.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance present');
+	ok($.data(inp[0], TestHelpers.datepicker.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.PROP_NAME), 'Default - instance absent');
+	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Default - instance absent');
 	ok(inp.next().is('#alt'), 'Default - button absent');
 	// With button
-	inp= init('#inp', {showOn: 'both'});
+	inp= TestHelpers.datepicker.init('#inp', {showOn: 'both'});
 	ok(inp.is('.hasDatepicker'), 'Button - marker class set');
-	ok($.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance present');
+	ok($.data(inp[0], TestHelpers.datepicker.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.PROP_NAME), 'Button - instance absent');
+	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Button - instance absent');
 	ok(inp.next().is('#alt'), 'Button - button removed');
 	// With append text
-	inp = init('#inp', {appendText: 'Testing'});
+	inp = TestHelpers.datepicker.init('#inp', {appendText: 'Testing'});
 	ok(inp.is('.hasDatepicker'), 'Append - marker class set');
-	ok($.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance present');
+	ok($.data(inp[0], TestHelpers.datepicker.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.PROP_NAME), 'Append - instance absent');
+	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Append - instance absent');
 	ok(inp.next().is('#alt'), 'Append - append text removed');
 	// With both
-	inp= init('#inp', {showOn: 'both', buttonImageOnly: true,
+	inp= TestHelpers.datepicker.init('#inp', {showOn: 'both', buttonImageOnly: true,
 		buttonImage: 'img/calendar.gif', appendText: 'Testing'});
 	ok(inp.is('.hasDatepicker'), 'Both - marker class set');
-	ok($.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance present');
+	ok($.data(inp[0], TestHelpers.datepicker.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.PROP_NAME), 'Both - instance absent');
+	ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), 'Both - instance absent');
 	ok(inp.next().is('#alt'), 'Both - button and append text absent');
 	// Inline
-	inl = init('#inl');
+	inl = TestHelpers.datepicker.init('#inl');
 	ok(inl.is('.hasDatepicker'), 'Inline - marker class set');
 	ok(inl.html() !== '', 'Inline - datepicker present');
-	ok($.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance present');
+	ok($.data(inl[0], TestHelpers.datepicker.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.PROP_NAME), 'Inline - instance absent');
+	ok(!$.data(inl[0], TestHelpers.datepicker.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 = init('#inp');
+		inp = TestHelpers.datepicker.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 +77,7 @@ test('enableDisable', function() {
 	ok(!inp[0].disabled, 'Enable/disable - field now enabled');
 	inp.datepicker('destroy');
 	// With a button
-	inp = init('#inp', {showOn: 'button'});
+	inp = TestHelpers.datepicker.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 +91,7 @@ test('enableDisable', function() {
 	ok(!inp.next('button')[0].disabled, 'Enable/disable button - button now enabled');
 	inp.datepicker('destroy');
 	// With an image button
-	inp = init('#inp', {showOn: 'button', buttonImageOnly: true,
+	inp = TestHelpers.datepicker.init('#inp', {showOn: 'button', buttonImageOnly: true,
 		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');
@@ -106,7 +106,7 @@ test('enableDisable', function() {
 	ok(parseFloat(inp.next('img').css('opacity')) === 1, 'Enable/disable image - image now enabled');
 	inp.datepicker('destroy');
 	// Inline
-	inl = init('#inl', {changeYear: true});
+	inl = TestHelpers.datepicker.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');