From be95a08c4dddc8b01002bf664794103fab2ffede Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 14 Feb 2025 11:25:35 -0800 Subject: [PATCH] feat(webkit): roll to r2137, update tests (#34806) --- packages/playwright-core/browsers.json | 2 +- .../src/server/webkit/protocol.d.ts | 232 ------------------ tests/library/browsercontext-fetch.spec.ts | 3 +- tests/library/modernizr.spec.ts | 9 - 4 files changed, 3 insertions(+), 243 deletions(-) diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json index 8d864d05ca..05ab76b816 100644 --- a/packages/playwright-core/browsers.json +++ b/packages/playwright-core/browsers.json @@ -39,7 +39,7 @@ }, { "name": "webkit", - "revision": "2134", + "revision": "2137", "installByDefault": true, "revisionOverrides": { "debian11-x64": "2105", diff --git a/packages/playwright-core/src/server/webkit/protocol.d.ts b/packages/playwright-core/src/server/webkit/protocol.d.ts index ea34222382..c915b74e11 100644 --- a/packages/playwright-core/src/server/webkit/protocol.d.ts +++ b/packages/playwright-core/src/server/webkit/protocol.d.ts @@ -193,142 +193,6 @@ export module Protocol { } } - export module ApplicationCache { - /** - * Detailed application cache resource information. - */ - export interface ApplicationCacheResource { - /** - * Resource url. - */ - url: string; - /** - * Resource size. - */ - size: number; - /** - * Resource type. - */ - type: string; - } - /** - * Detailed application cache information. - */ - export interface ApplicationCache { - /** - * Manifest URL. - */ - manifestURL: string; - /** - * Application cache size. - */ - size: number; - /** - * Application cache creation time. - */ - creationTime: number; - /** - * Application cache update time. - */ - updateTime: number; - /** - * Application cache resources. - */ - resources: ApplicationCacheResource[]; - } - /** - * Frame identifier - manifest URL pair. - */ - export interface FrameWithManifest { - /** - * Frame identifier. - */ - frameId: Network.FrameId; - /** - * Manifest URL. - */ - manifestURL: string; - /** - * Application cache status. - */ - status: number; - } - - export type applicationCacheStatusUpdatedPayload = { - /** - * Identifier of the frame containing document whose application cache updated status. - */ - frameId: Network.FrameId; - /** - * Manifest URL. - */ - manifestURL: string; - /** - * Updated application cache status. - */ - status: number; - } - export type networkStateUpdatedPayload = { - isNowOnline: boolean; - } - - /** - * Returns array of frame identifiers with manifest urls for each frame containing a document associated with some application cache. - */ - export type getFramesWithManifestsParameters = { - } - export type getFramesWithManifestsReturnValue = { - /** - * Array of frame identifiers with manifest urls for each frame containing a document associated with some application cache. - */ - frameIds: FrameWithManifest[]; - } - /** - * Enables application cache domain notifications. - */ - export type enableParameters = { - } - export type enableReturnValue = { - } - /** - * Disable application cache domain notifications. - */ - export type disableParameters = { - } - export type disableReturnValue = { - } - /** - * Returns manifest URL for document in the given frame. - */ - export type getManifestForFrameParameters = { - /** - * Identifier of the frame containing document whose manifest is retrieved. - */ - frameId: Network.FrameId; - } - export type getManifestForFrameReturnValue = { - /** - * Manifest URL for document in the given frame. - */ - manifestURL: string; - } - /** - * Returns relevant application cache data for the document in given frame. - */ - export type getApplicationCacheForFrameParameters = { - /** - * Identifier of the frame containing document whose application cache is retrieved. - */ - frameId: Network.FrameId; - } - export type getApplicationCacheForFrameReturnValue = { - /** - * Relevant application cache data for the document in given frame. - */ - applicationCache: ApplicationCache; - } - } - export module Audit { @@ -3644,81 +3508,6 @@ might return multiple quads for inline nodes. } } - export module Database { - /** - * Unique identifier of Database object. - */ - export type DatabaseId = string; - /** - * Database object. - */ - export interface Database { - /** - * Database ID. - */ - id: DatabaseId; - /** - * Database domain. - */ - domain: string; - /** - * Database name. - */ - name: string; - /** - * Database version. - */ - version: string; - } - /** - * Database error. - */ - export interface Error { - /** - * Error message. - */ - message: string; - /** - * Error code. - */ - code: number; - } - - export type addDatabasePayload = { - database: Database; - } - - /** - * Enables database tracking, database events will now be delivered to the client. - */ - export type enableParameters = { - } - export type enableReturnValue = { - } - /** - * Disables database tracking, prevents database events from being sent to the client. - */ - export type disableParameters = { - } - export type disableReturnValue = { - } - export type getDatabaseTableNamesParameters = { - databaseId: DatabaseId; - } - export type getDatabaseTableNamesReturnValue = { - tableNames: string[]; - } - export type executeSQLParameters = { - databaseId: DatabaseId; - query: string; - } - export type executeSQLReturnValue = { - columnNames?: string[]; - values?: any[]; - sqlError?: Error; - } - } - /** * Debugger domain exposes JavaScript debugging capabilities. It allows setting and removing breakpoints, stepping through execution, exploring stack traces, etc. */ @@ -9285,8 +9074,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the "Animation.trackingStart": Animation.trackingStartPayload; "Animation.trackingUpdate": Animation.trackingUpdatePayload; "Animation.trackingComplete": Animation.trackingCompletePayload; - "ApplicationCache.applicationCacheStatusUpdated": ApplicationCache.applicationCacheStatusUpdatedPayload; - "ApplicationCache.networkStateUpdated": ApplicationCache.networkStateUpdatedPayload; "Browser.extensionsEnabled": Browser.extensionsEnabledPayload; "Browser.extensionsDisabled": Browser.extensionsDisabledPayload; "CPUProfiler.trackingStart": CPUProfiler.trackingStartPayload; @@ -9336,7 +9123,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the "DOMStorage.domStorageItemRemoved": DOMStorage.domStorageItemRemovedPayload; "DOMStorage.domStorageItemAdded": DOMStorage.domStorageItemAddedPayload; "DOMStorage.domStorageItemUpdated": DOMStorage.domStorageItemUpdatedPayload; - "Database.addDatabase": Database.addDatabasePayload; "Debugger.globalObjectCleared": Debugger.globalObjectClearedPayload; "Debugger.scriptParsed": Debugger.scriptParsedPayload; "Debugger.scriptFailedToParse": Debugger.scriptFailedToParsePayload; @@ -9418,11 +9204,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the "Animation.resolveAnimation": Animation.resolveAnimationParameters; "Animation.startTracking": Animation.startTrackingParameters; "Animation.stopTracking": Animation.stopTrackingParameters; - "ApplicationCache.getFramesWithManifests": ApplicationCache.getFramesWithManifestsParameters; - "ApplicationCache.enable": ApplicationCache.enableParameters; - "ApplicationCache.disable": ApplicationCache.disableParameters; - "ApplicationCache.getManifestForFrame": ApplicationCache.getManifestForFrameParameters; - "ApplicationCache.getApplicationCacheForFrame": ApplicationCache.getApplicationCacheForFrameParameters; "Audit.setup": Audit.setupParameters; "Audit.run": Audit.runParameters; "Audit.teardown": Audit.teardownParameters; @@ -9532,10 +9313,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemParameters; "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemParameters; "DOMStorage.clearDOMStorageItems": DOMStorage.clearDOMStorageItemsParameters; - "Database.enable": Database.enableParameters; - "Database.disable": Database.disableParameters; - "Database.getDatabaseTableNames": Database.getDatabaseTableNamesParameters; - "Database.executeSQL": Database.executeSQLParameters; "Debugger.enable": Debugger.enableParameters; "Debugger.disable": Debugger.disableParameters; "Debugger.setAsyncStackTraceDepth": Debugger.setAsyncStackTraceDepthParameters; @@ -9731,11 +9508,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the "Animation.resolveAnimation": Animation.resolveAnimationReturnValue; "Animation.startTracking": Animation.startTrackingReturnValue; "Animation.stopTracking": Animation.stopTrackingReturnValue; - "ApplicationCache.getFramesWithManifests": ApplicationCache.getFramesWithManifestsReturnValue; - "ApplicationCache.enable": ApplicationCache.enableReturnValue; - "ApplicationCache.disable": ApplicationCache.disableReturnValue; - "ApplicationCache.getManifestForFrame": ApplicationCache.getManifestForFrameReturnValue; - "ApplicationCache.getApplicationCacheForFrame": ApplicationCache.getApplicationCacheForFrameReturnValue; "Audit.setup": Audit.setupReturnValue; "Audit.run": Audit.runReturnValue; "Audit.teardown": Audit.teardownReturnValue; @@ -9845,10 +9617,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemReturnValue; "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemReturnValue; "DOMStorage.clearDOMStorageItems": DOMStorage.clearDOMStorageItemsReturnValue; - "Database.enable": Database.enableReturnValue; - "Database.disable": Database.disableReturnValue; - "Database.getDatabaseTableNames": Database.getDatabaseTableNamesReturnValue; - "Database.executeSQL": Database.executeSQLReturnValue; "Debugger.enable": Debugger.enableReturnValue; "Debugger.disable": Debugger.disableReturnValue; "Debugger.setAsyncStackTraceDepth": Debugger.setAsyncStackTraceDepthReturnValue; diff --git a/tests/library/browsercontext-fetch.spec.ts b/tests/library/browsercontext-fetch.spec.ts index f23b59f97c..ff0c1e86a8 100644 --- a/tests/library/browsercontext-fetch.spec.ts +++ b/tests/library/browsercontext-fetch.spec.ts @@ -280,7 +280,8 @@ it('should add cookies from Set-Cookie header', async ({ context, page, server } expect((await page.evaluate(() => document.cookie)).split(';').map(s => s.trim()).sort()).toEqual(['foo=bar', 'session=value']); }); -it('should preserve cookie order from Set-Cookie header', async ({ context, page, server }) => { +it('should preserve cookie order from Set-Cookie header', async ({ context, page, server, browserName, isLinux }) => { + it.fixme(browserName === 'webkit' && isLinux, 'https://github.com/microsoft/playwright-browsers/issues/1512'); it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23390' }); server.setRoute('/setcookie.html', (req, res) => { res.setHeader('Set-Cookie', ['cookie.0=foo', 'cookie.1=bar']); diff --git a/tests/library/modernizr.spec.ts b/tests/library/modernizr.spec.ts index 0a1b124301..5505e387c1 100644 --- a/tests/library/modernizr.spec.ts +++ b/tests/library/modernizr.spec.ts @@ -66,7 +66,6 @@ it('Safari Desktop', async ({ browser, browserName, platform, server, headless } } if (platform === 'win32') { - expected.datalistelem = false; expected.getusermedia = false; expected.peerconnection = false; expected.speechrecognition = false; @@ -75,7 +74,6 @@ it('Safari Desktop', async ({ browser, browserName, platform, server, headless } expected.webaudio = false; expected.gamepads = false; - expected.input.list = false; delete expected.datalistelem; expected.publickeycredential = false; @@ -84,8 +82,6 @@ it('Safari Desktop', async ({ browser, browserName, platform, server, headless } expected.datachannel = false; expected.inputtypes.color = false; - expected.inputtypes.month = false; - expected.inputtypes.week = false; expected.inputtypes.date = false; expected.inputtypes['datetime-local'] = false; expected.inputtypes.time = false; @@ -133,7 +129,6 @@ it('Mobile Safari', async ({ playwright, browser, browserName, platform, server, } if (platform === 'win32') { - expected.datalistelem = false; expected.getusermedia = false; expected.peerconnection = false; expected.speechrecognition = false; @@ -142,8 +137,6 @@ it('Mobile Safari', async ({ playwright, browser, browserName, platform, server, expected.webaudio = false; expected.gamepads = false; - expected.input.list = false; - delete expected.datalistelem; expected.publickeycredential = false; @@ -152,8 +145,6 @@ it('Mobile Safari', async ({ playwright, browser, browserName, platform, server, expected.datachannel = false; expected.inputtypes.color = false; - expected.inputtypes.month = false; - expected.inputtypes.week = false; expected.inputtypes.date = false; expected.inputtypes['datetime-local'] = false; expected.inputtypes.time = false;