Skip to content

Commit 5eea57b

Browse files
committed
fix: failing formatPushTime test for some timezones
1 parent 0cff830 commit 5eea57b

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

spec/PushController.spec.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,18 +1175,17 @@ describe('PushController', () => {
11751175
).toBe('2007-04-05T14:30:00.000Z', 'Timezone offset');
11761176

11771177
const noTimezone = new Date('2017-09-06T17:14:01.048');
1178-
let expectedHour = 17 + noTimezone.getTimezoneOffset() / 60;
1179-
let day = '06';
1180-
if (expectedHour >= 24) {
1181-
expectedHour = expectedHour - 24;
1182-
day = '07';
1183-
}
1178+
const expectedHour = noTimezone.getUTCHours();
1179+
const expectedMinute = noTimezone.getUTCMinutes();
1180+
const day = noTimezone
1181+
.getUTCDate()
1182+
.toLocaleString('en-US', { minimumIntegerDigits: 2, useGrouping: false });
11841183
expect(
11851184
PushController.formatPushTime({
11861185
date: noTimezone,
11871186
isLocalTime: true,
11881187
})
1189-
).toBe(`2017-09-${day}T${expectedHour.toString().padStart(2, '0')}:14:01.048`, 'No timezone');
1188+
).toBe(`2017-09-${day}T${expectedHour}:${expectedMinute}:01.048`, 'No timezone');
11901189
expect(
11911190
PushController.formatPushTime({
11921191
date: new Date('2017-09-06'),
@@ -1208,12 +1207,12 @@ describe('PushController', () => {
12081207
},
12091208
};
12101209
const pushTime = '2017-09-06T17:14:01.048';
1211-
let expectedHour = 17 + new Date(pushTime).getTimezoneOffset() / 60;
1212-
let day = '06';
1213-
if (expectedHour >= 24) {
1214-
expectedHour = expectedHour - 24;
1215-
day = '07';
1216-
}
1210+
const pushDate = new Date(pushTime);
1211+
const expectedHour = pushDate.getUTCHours();
1212+
const expectedMinute = pushDate.getUTCMinutes();
1213+
const day = pushDate
1214+
.getUTCDate()
1215+
.toLocaleString('en-US', { minimumIntegerDigits: 2, useGrouping: false });
12171216
const payload = {
12181217
data: {
12191218
alert: 'Hello World!',
@@ -1230,7 +1229,7 @@ describe('PushController', () => {
12301229
const pushStatus = await Parse.Push.getPushStatus(pushStatusId);
12311230
expect(pushStatus.get('status')).toBe('scheduled');
12321231
expect(pushStatus.get('pushTime')).toBe(
1233-
`2017-09-${day}T${expectedHour.toString().padStart(2, '0')}:14:01.048`
1232+
`2017-09-${day}T${expectedHour}:${expectedMinute}:01.048`
12341233
);
12351234
});
12361235
});

0 commit comments

Comments
 (0)