Skip to content

Calendar: Create helper methods for Date object creation #1818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2017
Merged

Calendar: Create helper methods for Date object creation #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions tests/unit/calendar/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ QUnit.test( "Localization", function( assert ) {
assert.expect( 10 );

var that = this,
date = new Date( 2014, 0, 1 ),
date = testHelper.createDate( 2014, 0, 1 ),
optionsDe = {
locale: "de",
labels: {
Expand Down Expand Up @@ -149,7 +149,7 @@ QUnit.test( "keyboard handling", function( assert ) {
that = this;

function step1() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper
.focusGrid( that.element )
Expand All @@ -158,7 +158,7 @@ QUnit.test( "keyboard handling", function( assert ) {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2013, 12 - 1, 31 ),
testHelper.createDate( 2013, 12 - 1, 31 ),
"Keystroke left to switch to previous day"
);
that.element.calendar( "destroy" );
Expand All @@ -167,29 +167,29 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step2() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element )
.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } )
.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );

assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2014, 1 - 1, 2 ),
testHelper.createDate( 2014, 1 - 1, 2 ),
"Keystroke right to switch to next day"
);
step3();
}

function step3() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element ).simulate( "keydown", { keyCode: $.ui.keyCode.UP } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2013, 12 - 1, 25 ),
testHelper.createDate( 2013, 12 - 1, 25 ),
"Keystroke up to move to the previous week"
);
that.element.calendar( "destroy" );
Expand All @@ -198,14 +198,14 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step4() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element ).simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2014, 1 - 1, 8 ),
testHelper.createDate( 2014, 1 - 1, 8 ),
"Keystroke down to move to the next week"
);
that.element.calendar( "destroy" );
Expand All @@ -214,14 +214,14 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step5() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2013, 12 - 1, 1 ),
testHelper.createDate( 2013, 12 - 1, 1 ),
"Keystroke Page Up moves date to previous month"
);
that.element.calendar( "destroy" );
Expand All @@ -230,15 +230,15 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step6() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element )
.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP, altKey: true } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2013, 1 - 1, 1 ),
testHelper.createDate( 2013, 1 - 1, 1 ),
"Keystroke Page Up + ALT moves date to previous year"
);
that.element.calendar( "destroy" );
Expand All @@ -247,14 +247,14 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step7() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2014, 2 - 1, 1 ),
testHelper.createDate( 2014, 2 - 1, 1 ),
"Keystroke Page Down moves date to next month"
);
that.element.calendar( "destroy" );
Expand All @@ -263,15 +263,15 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step8() {
that.element.calendar( { value: new Date( 2014, 1 - 1, 1 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 1 - 1, 1 ) } );

testHelper.focusGrid( that.element )
.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN, altKey: true } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2015, 1 - 1, 1 ),
testHelper.createDate( 2015, 1 - 1, 1 ),
"Keystroke Page Down + ALT moves date to next year"
);
that.element.calendar( "destroy" );
Expand All @@ -281,14 +281,14 @@ QUnit.test( "keyboard handling", function( assert ) {

// Check for moving to short months
function step9() {
that.element.calendar( { value: new Date( 2014, 3 - 1, 31 ) } );
that.element.calendar( { value: testHelper.createDate( 2014, 3 - 1, 31 ) } );

testHelper.focusGrid( that.element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2014, 2 - 1, 28 ),
testHelper.createDate( 2014, 2 - 1, 28 ),
"Keystroke Page Up and short months"
);
that.element.calendar( "destroy" );
Expand All @@ -297,14 +297,14 @@ QUnit.test( "keyboard handling", function( assert ) {
}

function step10() {
that.element.calendar( { value: new Date( 2016, 1 - 1, 30 ) } );
that.element.calendar( { value: testHelper.createDate( 2016, 1 - 1, 30 ) } );

testHelper.focusGrid( that.element ).simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
setTimeout( function() {
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2016, 2 - 1, 29 ),
testHelper.createDate( 2016, 2 - 1, 29 ),
"Keystroke Page Down and leap years"
);
ready();
Expand All @@ -319,7 +319,7 @@ QUnit.test( "mouse", function( assert ) {

var ready = assert.async(),
that = this,
date = new Date();
date = testHelper.createDate();

function step1() {
$( "tbody button:contains(10)", that.element ).simulate( "mousedown" );
Expand All @@ -330,30 +330,30 @@ QUnit.test( "mouse", function( assert ) {
"Mouse click"
);

that.element.calendar( "option", "value", new Date( 2008, 2 - 1, 4 ) );
that.element.calendar( "option", "value", testHelper.createDate( 2008, 2 - 1, 4 ) );
$( ".ui-calendar-calendar tbody button:contains(12)", that.element ).simulate( "mousedown" );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2008, 2 - 1, 12 ),
testHelper.createDate( 2008, 2 - 1, 12 ),
"Mouse click - preset"
);

// Previous/next
that.element.calendar( "option", "value", new Date( 2008, 2 - 1, 4 ) );
that.element.calendar( "option", "value", testHelper.createDate( 2008, 2 - 1, 4 ) );
$( ".ui-calendar-prev", that.element ).simulate( "click" );
$( ".ui-calendar-calendar tbody button:contains(16)", that.element ).simulate( "mousedown" );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2008, 1 - 1, 16 ),
testHelper.createDate( 2008, 1 - 1, 16 ),
"Mouse click - previous"
);

that.element.calendar( "option", "value", new Date( 2008, 2 - 1, 4 ) );
that.element.calendar( "option", "value", testHelper.createDate( 2008, 2 - 1, 4 ) );
$( ".ui-calendar-next", that.element ).simulate( "click" );
$( ".ui-calendar-calendar tbody button:contains(18)", that.element ).simulate( "mousedown" );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2008, 3 - 1, 18 ),
testHelper.createDate( 2008, 3 - 1, 18 ),
"Mouse click - next"
);

Expand All @@ -364,16 +364,16 @@ QUnit.test( "mouse", function( assert ) {
function step2() {
that.element.calendar( "destroy" );
that.element.calendar( {
value: new Date( 2008, 3 - 1, 4 ),
min: new Date( 2008, 2 - 1, 2 ),
max: new Date( 2008, 2 - 1, 26 )
value: testHelper.createDate( 2008, 3 - 1, 4 ),
min: testHelper.createDate( 2008, 2 - 1, 2 ),
max: testHelper.createDate( 2008, 2 - 1, 26 )
} );

$( ".ui-calendar-prev", that.element ).simulate( "click" );
$( "tbody button:contains(16)", that.element ).simulate( "mousedown" );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2008, 2 - 1, 16 ),
testHelper.createDate( 2008, 2 - 1, 16 ),
"Mouse click - previous + min/max"
);
step3();
Expand All @@ -382,16 +382,16 @@ QUnit.test( "mouse", function( assert ) {
function step3() {
that.element.calendar( "destroy" );
that.element.calendar( {
value: new Date( 2008, 1 - 1, 4 ),
min: new Date( 2008, 2 - 1, 2 ),
max: new Date( 2008, 2 - 1, 26 )
value: testHelper.createDate( 2008, 1 - 1, 4 ),
min: testHelper.createDate( 2008, 2 - 1, 2 ),
max: testHelper.createDate( 2008, 2 - 1, 26 )
} );

$( ".ui-calendar-next", that.element ).simulate( "click" );
$( "tbody button:contains(18)", that.element ).simulate( "mousedown" );
assert.dateEqual(
that.element.calendar( "valueAsDate" ),
new Date( 2008, 2 - 1, 18 ),
testHelper.createDate( 2008, 2 - 1, 18 ),
"Mouse click - next + min/max"
);
ready();
Expand Down
11 changes: 11 additions & 0 deletions tests/unit/calendar/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ define( [
], function( $, helper ) {

return $.extend( helper, {
createDate: function( year, month, day ) {
if ( arguments.length === 1 ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't need to worry about this case for timezone correction, but having all dates go through the helper does make it easier to reason about in the tests.

return new Date( year );
}

if ( arguments.length === 3 ) {
return new Date( year, month, day );
}

return new Date();
},
focusGrid: function( element ) {
element.find( ":tabbable" ).last().simulate( "focus" );
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB } );
Expand Down
21 changes: 11 additions & 10 deletions tests/unit/calendar/methods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
define( [
"qunit",
"jquery",
"./helper",
"ui/widgets/calendar"
], function( QUnit, $ ) {
], function( QUnit, $, testHelper ) {

QUnit.module( "calendar: methods", {
beforeEach: function() {
Expand Down Expand Up @@ -64,15 +65,15 @@ QUnit.test( "valueAsDate", function( assert ) {
assert.expect( 11 );

var minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
date1 = new Date( 2008, 6 - 1, 4 ),
date1 = testHelper.createDate( 2008, 6 - 1, 4 ),
date2;

this.element.calendar( "valueAsDate", new Date( 2014, 0, 1 ) );
this.element.calendar( "valueAsDate", testHelper.createDate( 2014, 0, 1 ) );
assert.ok( this.element.find( "button[data-ui-calendar-timestamp]:first" )
.hasClass( "ui-state-active" ),
"First day marked as selected"
);
assert.dateEqual( this.element.calendar( "valueAsDate" ), new Date( 2014, 0, 1 ), "Getter" );
assert.dateEqual( this.element.calendar( "valueAsDate" ), testHelper.createDate( 2014, 0, 1 ), "Getter" );

this.element.calendar( "destroy" );
this.element.calendar();
Expand All @@ -82,10 +83,10 @@ QUnit.test( "valueAsDate", function( assert ) {
assert.dateEqual( this.element.calendar( "valueAsDate" ), date1, "Set date - 2008-06-04" );

// With minimum / maximum
date1 = new Date( 2008, 1 - 1, 4 );
date2 = new Date( 2008, 6 - 1, 4 );
minDate = new Date( 2008, 2 - 1, 29 );
maxDate = new Date( 2008, 3 - 1, 28 );
date1 = testHelper.createDate( 2008, 1 - 1, 4 );
date2 = testHelper.createDate( 2008, 6 - 1, 4 );
minDate = testHelper.createDate( 2008, 2 - 1, 29 );
maxDate = testHelper.createDate( 2008, 3 - 1, 28 );

this.element
.calendar( "option", { min: minDate } )
Expand Down Expand Up @@ -133,8 +134,8 @@ QUnit.test( "valueAsDate", function( assert ) {
null, "Set date min/max - value > max"
);

dateAndTimeToSet = new Date( 2008, 3 - 1, 28, 1, 11, 0 );
dateAndTimeClone = new Date( 2008, 3 - 1, 28, 1, 11, 0 );
dateAndTimeToSet = testHelper.createDate( 2008, 3 - 1, 28, 1, 11, 0 );
dateAndTimeClone = testHelper.createDate( 2008, 3 - 1, 28, 1, 11, 0 );
this.element.calendar( "valueAsDate", dateAndTimeToSet );
assert.equal(
dateAndTimeToSet.getTime(),
Expand Down
Loading