Skip to content

Abbreviate post schedule date when possible #41738

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
noisysocks merged 4 commits into from
Jun 20, 2022
Merged

Abbreviate post schedule date when possible #41738

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3547181
Abbreviate post schedule date when possible
noisysocks Jun 15, 2022
3ec6ac3
Fix datepicker e2e tests
noisysocks Jun 16, 2022
9ca0477
Use explicit \xa0 sequence for non-breaking space
noisysocks Jun 16, 2022
2ee3ef0
Fix text wrapping on hover
noisysocks Jun 16, 2022
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
Prev Previous commit
Next Next commit
Fix datepicker e2e tests
  • Loading branch information
@noisysocks
noisysocks committed Jun 16, 2022
commit 3ec6ac34f5b5e512f9a5ec2df61adc54380963d3
20 changes: 9 additions & 11 deletions packages/e2e-tests/specs/editor/various/datepicker.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,13 @@ function trimLeadingZero( str ) {
return str[ 0 ] === '0' ? str.slice( 1 ) : str;
}

function formatDatePickerValues( {
year,
monthLabel,
day,
hours,
minutes,
amOrPm,
} ) {
function formatDatePickerValues(
{ year, monthLabel, day, hours, minutes, amOrPm },
timezone
) {
const dayTrimmed = trimLeadingZero( day );
const hoursTrimmed = trimLeadingZero( hours );
return `${ monthLabel } ${ dayTrimmed }, ${ year } ${ hoursTrimmed }:${ minutes } ${ amOrPm }`;
return `${ monthLabel } ${ dayTrimmed }, ${ year } ${ hoursTrimmed }:${ minutes } ${ amOrPm } ${ timezone }`;
}

async function getPublishingDate() {
Expand All @@ -70,11 +66,13 @@ describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )(
( timezone ) => {
let oldTimezone;
beforeEach( async () => {
await page.emulateTimezone( 'America/New_York' ); // Set browser to a timezone that's different to `timezone`.
oldTimezone = await changeSiteTimezone( timezone );
await createNewPost();
} );
afterEach( async () => {
await changeSiteTimezone( oldTimezone );
await page.emulateTimezone( null );
} );

it( 'should show the publishing date as "Immediately" if the date is not altered', async () => {
Expand All @@ -98,7 +96,7 @@ describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )(
const publishingDate = await getPublishingDate();

expect( publishingDate ).toBe(
formatDatePickerValues( datePickerValues )
formatDatePickerValues( datePickerValues, timezone )
);
} );

Expand All @@ -119,7 +117,7 @@ describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )(
expect( publishingDate ).not.toEqual( 'Immediately' );
// The expected date format will be "Sep 26, 2018 11:52 pm".
expect( publishingDate ).toBe(
formatDatePickerValues( datePickerValues )
formatDatePickerValues( datePickerValues, timezone )
);
} );

Expand Down