Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
fix(tracing): resourceOverrides issues (#38750)
Dmitry Gozmand7f8595f6c9b
diff --git a/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts b/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.tsindex 86fa015eb3..1a6effdceb 100644--- a/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts+++ b/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts@@ -86,6 +86,7 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:class Streamer {private _lastSnapshotNumber = 0;private _staleStyleSheets = new Set<CSSStyleSheet>();+ private _modifiedStyleSheets = new Set<CSSStyleSheet>();private _readingStyleSheet = false; // To avoid invalidating due to our own reads.private _fakeBase: HTMLBaseElement;private _observer: MutationObserver;@@ -105,6 +106,10 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:this._interceptNativeMethod(window.CSSGroupingRule.prototype, 'insertRule', invalidateCSSGroupingRule);this._interceptNativeMethod(window.CSSGroupingRule.prototype, 'deleteRule', invalidateCSSGroupingRule);this._interceptNativeGetter(window.CSSGroupingRule.prototype, 'cssRules', invalidateCSSGroupingRule);+ this._interceptNativeSetter(window.StyleSheet.prototype, 'disabled', (sheet: StyleSheet) => {+ if (sheet instanceof CSSStyleSheet)+ this._invalidateStyleSheet(sheet as CSSStyleSheet);+ });this._interceptNativeAsyncMethod(window.CSSStyleSheet.prototype, 'replace', (sheet: CSSStyleSheet) => this._invalidateStyleSheet(sheet));this._fakeBase = document.createElement('base');@@ -191,6 +196,18 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:});}+ private _interceptNativeSetter(obj: any, prop: string, cb: (thisObj: any, result: any) => void) {+ const descriptor = Object.getOwnPropertyDescriptor(obj, prop)!;+ Object.defineProperty(obj, prop, {+ ...descriptor,+ set: function(value: any) {+ const result = descriptor.set!.call(this, value);+ cb(this, value);+ return result;+ },+ });+ }+private _handleMutations(list: MutationRecord[]) {for (const mutation of list)ensureCachedData(mutation.target).attributesCached = undefined;@@ -200,6 +217,8 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:if (this._readingStyleSheet)return;this._staleStyleSheets.add(sheet);+ if (sheet.href !== null)+ this._modifiedStyleSheets.add(sheet);}private _updateStyleElementStyleSheetTextIfNeeded(sheet: CSSStyleSheet, forceText?: boolean): string | undefined {@@ -309,6 +328,8 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:private _getSheetText(sheet: CSSStyleSheet): string {this._readingStyleSheet = true;try {+ if (sheet.disabled)+ return '';const rules: string[] = [];for (const rule of sheet.cssRules)rules.push(rule.cssText);@@ -614,7 +635,7 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:collectionTime: 0,};- for (const sheet of this._staleStyleSheets) {+ for (const sheet of this._modifiedStyleSheets) {if (sheet.href === null)continue;const content = this._updateLinkStyleSheetTextIfNeeded(sheet, snapshotNumber);diff --git a/packages/playwright-core/src/utils/isomorphic/trace/snapshotRenderer.ts b/packages/playwright-core/src/utils/isomorphic/trace/snapshotRenderer.tsindex 64efaebb36..fc8d420efb 100644--- a/packages/playwright-core/src/utils/isomorphic/trace/snapshotRenderer.ts+++ b/packages/playwright-core/src/utils/isomorphic/trace/snapshotRenderer.ts@@ -193,20 +193,24 @@ export class SnapshotRenderer {let result = sameFrameResource ?? otherFrameResource;if (result && method.toUpperCase() === 'GET') {// Patch override if necessary.- for (const o of snapshot.resourceOverrides) {- if (url === o.url && o.sha1) {- result = {- ...result,- response: {- ...result.response,- content: {- ...result.response.content,- _sha1: o.sha1,- }- },- };- break;- }+ let override = snapshot.resourceOverrides.find(o => o.url === url);+ if (override?.ref) {+ // "ref" means use the same content as "ref" snapshots ago.+ const index = this._index - override.ref;+ if (index >= 0 && index < this._snapshots.length)+ override = this._snapshots[index].resourceOverrides.find(o => o.url === url);+ }+ if (override?.sha1) {+ result = {+ ...result,+ response: {+ ...result.response,+ content: {+ ...result.response.content,+ _sha1: override.sha1,+ }+ },+ };}}diff --git a/tests/library/trace-viewer.spec.ts b/tests/library/trace-viewer.spec.tsindex 0dee62a814..0e03f7fb1d 100644--- a/tests/library/trace-viewer.spec.ts+++ b/tests/library/trace-viewer.spec.ts@@ -2178,6 +2178,8 @@ test('should respect CSSOM changes', async ({ runAndTrace, page, server }) => {await page.goto(server.EMPTY_PAGE);await page.setContent('<link rel="stylesheet" href="style.css"><button>Hello</button>');await page.evaluate(() => { (document.styleSheets[0].cssRules[0] as any).style.color = 'blue'; });+ await page.evaluate(() => '1 + 1');+ await page.evaluate(() => { document.styleSheets[0].disabled = true; });});const frame1 = await traceViewer.snapshotFrame('Set content', 0);@@ -2196,6 +2198,11 @@ test('should respect CSSOM changes', async ({ runAndTrace, page, server }) => {await expect(frame6.locator('button')).toHaveCSS('color', 'rgb(255, 0, 0)');const frame7 = await traceViewer.snapshotFrame('Evaluate', 4);await expect(frame7.locator('button')).toHaveCSS('color', 'rgb(0, 0, 255)');+ const frame8 = await traceViewer.snapshotFrame('Evaluate', 5);+ await traceViewer.page.waitForTimeout(1000); // give it time to render wrong color+ await expect(frame8.locator('button')).toHaveCSS('color', 'rgb(0, 0, 255)');+ const frame9 = await traceViewer.snapshotFrame('Evaluate', 6);+ await expect(frame9.locator('button')).toHaveCSS('color', 'rgb(0, 0, 0)');});test('should preserve custom doctype', async ({ runAndTrace, page }) => {