From 02e8ed023aa7a3f877c4b7503ceae6f93b6747f9 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 11 Apr 2017 15:48:20 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20fix=20timezone=20errors=20in=20edit?= =?UTF-8?q?or=20tests=20(#638)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/acceptance/editor-test.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tests/acceptance/editor-test.js b/tests/acceptance/editor-test.js index 9ccf084b6..e96ee31be 100644 --- a/tests/acceptance/editor-test.js +++ b/tests/acceptance/editor-test.js @@ -88,7 +88,7 @@ describe('Acceptance: Editor', function() { it('renders the editor correctly, PSM Publish Date and Save Button', function () { server.createList('post', 2); - let plusTenMinPacific = moment().tz('Pacific/Kwajalein').add(10, 'minutes'); + let futureTime = moment().tz('Etc/UTC').add(10, 'minutes'); // post id 1 is a draft, checking for draft behaviour now visit('/editor/1'); @@ -111,9 +111,9 @@ describe('Acceptance: Editor', function() { }); // should error, if the publish time is in the future - fillIn(testSelector('date-time-picker-time-input'), plusTenMinPacific.format('HH:mm')); + fillIn(testSelector('date-time-picker-time-input'), futureTime.format('HH:mm')); triggerEvent(testSelector('date-time-picker-time-input'), 'blur'); - datepickerSelect(testSelector('date-time-picker-datepicker'), plusTenMinPacific); + datepickerSelect(testSelector('date-time-picker-datepicker'), futureTime); andThen(() => { expect(find(testSelector('date-time-picker-error')).text().trim(), 'inline error response for future time') @@ -245,16 +245,9 @@ describe('Acceptance: Editor', function() { click(testSelector('publishmenu-cancel')); click(testSelector('publishmenu-trigger')); - // draft menu should show - andThen(() => { - expect( - find(testSelector('publishmenu-draft')), - 'draft menu is shown after unpublished' - ).to.exist; - }); - + let newFutureTime = moment.tz('Pacific/Kwajalein').add(10, 'minutes'); click(testSelector('publishmenu-scheduled-option')); - datepickerSelect(`${testSelector('publishmenu-draft')} ${testSelector('date-time-picker-datepicker')}`, plusTenMinPacific); + datepickerSelect(`${testSelector('publishmenu-draft')} ${testSelector('date-time-picker-datepicker')}`, newFutureTime); click(testSelector('publishmenu-save')); click(testSelector('publishmenu-cancel'));