Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(webkit): rewrite global object retrieval errors (#640)

Browse source
This commit is contained in:
Dmitry Gozman 2020-01-24 15:56:41 -08:00 committed by Pavel Feldman
parent fb9ec96e3e
commit f1d1dfb081
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/webkit/wkExecutionContext.ts
View file

@ -111,7 +111,15 @@ export class WKExecutionContext implements js.ExecutionContextDelegate {
serializableArgs = args; serializableArgs = args;
} }
const thisObjectId = await this._contextGlobalObjectId(); let thisObjectId;
try {
thisObjectId = await this._contextGlobalObjectId();
} catch (error) {
if (error.message.includes('Missing injected script for given'))
throw new Error('Execution context was destroyed, most likely because of a navigation.');
throw error;
}
let callFunctionOnPromise; let callFunctionOnPromise;
try { try {
callFunctionOnPromise = this._session.send('Runtime.callFunctionOn', { callFunctionOnPromise = this._session.send('Runtime.callFunctionOn', {

4
test/screenshot.spec.js
View file

@ -181,8 +181,8 @@ module.exports.describe = function({testRunner, expect, product, FFOX, CHROMIUM,
const screenshot = await page.screenshot(); const screenshot = await page.screenshot();
expect(screenshot).toBeGolden('screenshot-webgl.png'); expect(screenshot).toBeGolden('screenshot-webgl.png');
}); });
// firefox and webkit are flaky // firefox is flaky
it.skip(FFOX || WEBKIT)('should work while navigating', async({page, server}) => { it.skip(FFOX)('should work while navigating', async({page, server}) => {
await page.setViewport({width: 500, height: 500}); await page.setViewport({width: 500, height: 500});
await page.goto(server.PREFIX + '/redirectloop1.html'); await page.goto(server.PREFIX + '/redirectloop1.html');
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {