fix(reuse): reset sw, db, storages (#16265)
This commit is contained in:
parent
6b6b13c71b
commit
b3d30a808f
|
|
@ -180,7 +180,7 @@ export abstract class BrowserContext extends SdkObject {
|
||||||
await page?._frameManager.closeOpenDialogs();
|
await page?._frameManager.closeOpenDialogs();
|
||||||
// This should be before the navigation to about:blank so that we could save on
|
// This should be before the navigation to about:blank so that we could save on
|
||||||
// a navigation as we clear local storage.
|
// a navigation as we clear local storage.
|
||||||
await this._clearLocalStorage();
|
await this._clearStorage();
|
||||||
await page?.mainFrame().goto(metadata, 'about:blank', { timeout: 0 });
|
await page?.mainFrame().goto(metadata, 'about:blank', { timeout: 0 });
|
||||||
await this._removeExposedBindings();
|
await this._removeExposedBindings();
|
||||||
await this._removeInitScripts();
|
await this._removeInitScripts();
|
||||||
|
|
@ -471,7 +471,7 @@ export abstract class BrowserContext extends SdkObject {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
async _clearLocalStorage() {
|
async _clearStorage() {
|
||||||
if (!this._origins.size)
|
if (!this._origins.size)
|
||||||
return;
|
return;
|
||||||
let page = this.pages()[0];
|
let page = this.pages()[0];
|
||||||
|
|
@ -479,7 +479,7 @@ export abstract class BrowserContext extends SdkObject {
|
||||||
|
|
||||||
// Fast path.
|
// Fast path.
|
||||||
if (page && originArray.length === 1 && page.mainFrame().url().startsWith(originArray[0])) {
|
if (page && originArray.length === 1 && page.mainFrame().url().startsWith(originArray[0])) {
|
||||||
await page.mainFrame().evaluateExpression(`localStorage.clear()`, false, undefined, 'utility');
|
await page.mainFrame().clearStorageForCurrentOriginBestEffort();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -492,7 +492,7 @@ export abstract class BrowserContext extends SdkObject {
|
||||||
for (const origin of this._origins) {
|
for (const origin of this._origins) {
|
||||||
const frame = page.mainFrame();
|
const frame = page.mainFrame();
|
||||||
await frame.goto(internalMetadata, origin);
|
await frame.goto(internalMetadata, origin);
|
||||||
await frame.evaluateExpression(`localStorage.clear()`, false, undefined, 'utility');
|
await frame.clearStorageForCurrentOriginBestEffort();
|
||||||
}
|
}
|
||||||
await page._setServerRequestInterceptor(undefined);
|
await page._setServerRequestInterceptor(undefined);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1699,6 +1699,26 @@ export class Frame extends SdkObject {
|
||||||
throw new Error(`Error: frame navigated while waiting for selector "${selector}"`);
|
throw new Error(`Error: frame navigated while waiting for selector "${selector}"`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async clearStorageForCurrentOriginBestEffort() {
|
||||||
|
const context = await this._utilityContext();
|
||||||
|
await context.evaluate(async () => {
|
||||||
|
// Clean DOMStorage
|
||||||
|
sessionStorage.clear();
|
||||||
|
localStorage.clear();
|
||||||
|
|
||||||
|
// Clean Service Workers
|
||||||
|
const registrations = await navigator.serviceWorker.getRegistrations();
|
||||||
|
await Promise.all(registrations.map(r => r.unregister()));
|
||||||
|
|
||||||
|
// Clean IndexedDB
|
||||||
|
for (const db of await indexedDB.databases?.() || []) {
|
||||||
|
// Do not wait for the callback - it is called on timer in Chromium (slow).
|
||||||
|
if (db.name)
|
||||||
|
indexedDB.deleteDatabase(db.name!);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class RerunnableTask<T> {
|
class RerunnableTask<T> {
|
||||||
|
|
|
||||||
|
|
@ -168,3 +168,84 @@ test('should work with manually closed pages', async ({ runInlineTest }) => {
|
||||||
expect(result.exitCode).toBe(0);
|
expect(result.exitCode).toBe(0);
|
||||||
expect(result.passed).toBe(3);
|
expect(result.passed).toBe(3);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('should clean storage', async ({ runInlineTest }) => {
|
||||||
|
const result = await runInlineTest({
|
||||||
|
'playwright/index.html': `<script type="module" src="/playwright/index.ts"></script>`,
|
||||||
|
'playwright/index.ts': `
|
||||||
|
//@no-header
|
||||||
|
`,
|
||||||
|
|
||||||
|
'src/reuse.test.tsx': `
|
||||||
|
//@no-header
|
||||||
|
import { test, expect } from '@playwright/experimental-ct-react';
|
||||||
|
let lastContextGuid;
|
||||||
|
|
||||||
|
test('one', async ({ context, page }) => {
|
||||||
|
lastContextGuid = context._guid;
|
||||||
|
|
||||||
|
await page.evaluate(async () => {
|
||||||
|
localStorage.foo = 'bar';
|
||||||
|
sessionStorage.foo = 'bar';
|
||||||
|
});
|
||||||
|
|
||||||
|
const local = await page.evaluate('localStorage.foo');
|
||||||
|
const session = await page.evaluate('sessionStorage.foo');
|
||||||
|
expect(local).toBe('bar');
|
||||||
|
expect(session).toBe('bar');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('two', async ({ context, page }) => {
|
||||||
|
expect(context._guid).toBe(lastContextGuid);
|
||||||
|
const local = await page.evaluate('localStorage.foo');
|
||||||
|
const session = await page.evaluate('sessionStorage.foo');
|
||||||
|
|
||||||
|
expect(local).toBeFalsy();
|
||||||
|
expect(session).toBeFalsy();
|
||||||
|
});
|
||||||
|
`,
|
||||||
|
}, { workers: 1 });
|
||||||
|
expect(result.exitCode).toBe(0);
|
||||||
|
expect(result.passed).toBe(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should clean db', async ({ runInlineTest }) => {
|
||||||
|
test.slow();
|
||||||
|
const result = await runInlineTest({
|
||||||
|
'playwright/index.html': `<script type="module" src="/playwright/index.ts"></script>`,
|
||||||
|
'playwright/index.ts': `
|
||||||
|
//@no-header
|
||||||
|
`,
|
||||||
|
|
||||||
|
'src/reuse.test.tsx': `
|
||||||
|
//@no-header
|
||||||
|
import { test, expect } from '@playwright/experimental-ct-react';
|
||||||
|
let lastContextGuid;
|
||||||
|
|
||||||
|
test('one', async ({ context, page }) => {
|
||||||
|
lastContextGuid = context._guid;
|
||||||
|
await page.evaluate(async () => {
|
||||||
|
const dbRequest = indexedDB.open('db', 1);
|
||||||
|
await new Promise(f => dbRequest.onsuccess = f);
|
||||||
|
});
|
||||||
|
const dbnames = await page.evaluate(async () => {
|
||||||
|
const dbs = await indexedDB.databases();
|
||||||
|
return dbs.map(db => db.name);
|
||||||
|
});
|
||||||
|
expect(dbnames).toEqual(['db']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('two', async ({ context, page }) => {
|
||||||
|
expect(context._guid).toBe(lastContextGuid);
|
||||||
|
const dbnames = await page.evaluate(async () => {
|
||||||
|
const dbs = await indexedDB.databases();
|
||||||
|
return dbs.map(db => db.name);
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(dbnames).toEqual([]);
|
||||||
|
});
|
||||||
|
`,
|
||||||
|
}, { workers: 1 });
|
||||||
|
expect(result.exitCode).toBe(0);
|
||||||
|
expect(result.passed).toBe(2);
|
||||||
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue