From fb0004c22c796075f97fa3002bb01d0d1a3834f4 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Thu, 3 Jun 2021 16:21:23 -0700 Subject: [PATCH] feat(webkit): bump to 1492 (#6887) --- browsers.json | 2 +- tests/browsercontext-locale.spec.ts | 8 ++------ tests/browsercontext-timezone-id.spec.ts | 16 ++++------------ tests/defaultbrowsercontext-2.spec.ts | 4 +--- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/browsers.json b/browsers.json index dafc4ddf4b..ffffa19b37 100644 --- a/browsers.json +++ b/browsers.json @@ -18,7 +18,7 @@ }, { "name": "webkit", - "revision": "1490", + "revision": "1492", "installByDefault": true, "revisionOverrides": { "mac10.14": "1444" diff --git a/tests/browsercontext-locale.spec.ts b/tests/browsercontext-locale.spec.ts index b4b1a223ef..6ba4048b21 100644 --- a/tests/browsercontext-locale.spec.ts +++ b/tests/browsercontext-locale.spec.ts @@ -57,9 +57,7 @@ it('should format date', async ({browser, server, browserName}) => { const context = await browser.newContext({ locale: 'en-US', timezoneId: 'America/Los_Angeles' }); const page = await context.newPage(); await page.goto(server.EMPTY_PAGE); - const formatted = browserName === 'webkit' ? - 'Sat Nov 19 2016 10:12:34 GMT-0800' : - 'Sat Nov 19 2016 10:12:34 GMT-0800 (Pacific Standard Time)'; + const formatted = 'Sat Nov 19 2016 10:12:34 GMT-0800 (Pacific Standard Time)'; expect(await page.evaluate(() => new Date(1479579154987).toString())).toBe(formatted); await context.close(); } @@ -67,9 +65,7 @@ it('should format date', async ({browser, server, browserName}) => { const context = await browser.newContext({ locale: 'de-DE', timezoneId: 'Europe/Berlin' }); const page = await context.newPage(); await page.goto(server.EMPTY_PAGE); - const formatted = browserName === 'webkit' ? - 'Sat Nov 19 2016 19:12:34 GMT+0100' : - 'Sat Nov 19 2016 19:12:34 GMT+0100 (Mitteleuropäische Normalzeit)'; + const formatted = 'Sat Nov 19 2016 19:12:34 GMT+0100 (Mitteleuropäische Normalzeit)'; expect(await page.evaluate(() => new Date(1479579154987).toString())).toBe(formatted); await context.close(); } diff --git a/tests/browsercontext-timezone-id.spec.ts b/tests/browsercontext-timezone-id.spec.ts index e279b8f138..5147bf91f2 100644 --- a/tests/browsercontext-timezone-id.spec.ts +++ b/tests/browsercontext-timezone-id.spec.ts @@ -22,33 +22,25 @@ it('should work', async ({ browser, browserName }) => { { const context = await browser.newContext({ locale: 'en-US', timezoneId: 'America/Jamaica' }); const page = await context.newPage(); - expect(await page.evaluate(func)).toBe(browserName === 'webkit' ? - 'Sat Nov 19 2016 13:12:34 GMT-0500' : - 'Sat Nov 19 2016 13:12:34 GMT-0500 (Eastern Standard Time)'); + expect(await page.evaluate(func)).toBe('Sat Nov 19 2016 13:12:34 GMT-0500 (Eastern Standard Time)'); await context.close(); } { const context = await browser.newContext({ locale: 'en-US', timezoneId: 'Pacific/Honolulu' }); const page = await context.newPage(); - expect(await page.evaluate(func)).toBe(browserName === 'webkit' ? - 'Sat Nov 19 2016 08:12:34 GMT-1000' : - 'Sat Nov 19 2016 08:12:34 GMT-1000 (Hawaii-Aleutian Standard Time)'); + expect(await page.evaluate(func)).toBe('Sat Nov 19 2016 08:12:34 GMT-1000 (Hawaii-Aleutian Standard Time)'); await context.close(); } { const context = await browser.newContext({ locale: 'en-US', timezoneId: 'America/Buenos_Aires' }); const page = await context.newPage(); - expect(await page.evaluate(func)).toBe(browserName === 'webkit' ? - 'Sat Nov 19 2016 15:12:34 GMT-0300' : - 'Sat Nov 19 2016 15:12:34 GMT-0300 (Argentina Standard Time)'); + expect(await page.evaluate(func)).toBe('Sat Nov 19 2016 15:12:34 GMT-0300 (Argentina Standard Time)'); await context.close(); } { const context = await browser.newContext({ locale: 'en-US', timezoneId: 'Europe/Berlin' }); const page = await context.newPage(); - expect(await page.evaluate(func)).toBe(browserName === 'webkit' ? - 'Sat Nov 19 2016 19:12:34 GMT+0100' : - 'Sat Nov 19 2016 19:12:34 GMT+0100 (Central European Standard Time)'); + expect(await page.evaluate(func)).toBe('Sat Nov 19 2016 19:12:34 GMT+0100 (Central European Standard Time)'); await context.close(); } }); diff --git a/tests/defaultbrowsercontext-2.spec.ts b/tests/defaultbrowsercontext-2.spec.ts index 8f63dfe1c5..119aca3f92 100644 --- a/tests/defaultbrowsercontext-2.spec.ts +++ b/tests/defaultbrowsercontext-2.spec.ts @@ -46,9 +46,7 @@ it('should support reducedMotion option', async ({launchPersistent}) => { it('should support timezoneId option', async ({launchPersistent, browserName}) => { const {page} = await launchPersistent({locale: 'en-US', timezoneId: 'America/Jamaica'}); - expect(await page.evaluate(() => new Date(1479579154987).toString())).toBe(browserName === 'webkit' ? - 'Sat Nov 19 2016 13:12:34 GMT-0500' : - 'Sat Nov 19 2016 13:12:34 GMT-0500 (Eastern Standard Time)'); + expect(await page.evaluate(() => new Date(1479579154987).toString())).toBe('Sat Nov 19 2016 13:12:34 GMT-0500 (Eastern Standard Time)'); }); it('should support locale option', async ({launchPersistent}) => {