yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: account for linux treatment of canceled requests

Browse Source
This commit is contained in:
Pavel 2019-12-13 14:06:00 -08:00
parent aaa8f88f3c
commit cde81aaf5a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/webkit/NetworkManager.ts
View File

@ -168,7 +168,7 @@ export class NetworkManager extends EventEmitter {
const isCurrentDocument = request.request.frame()._lastDocumentId === request._documentId; const isCurrentDocument = request.request.frame()._lastDocumentId === request._documentId;
// When frame was detached during load, "cancelled" comes before detach. // When frame was detached during load, "cancelled" comes before detach.
// Ignore it and hope for the best. // Ignore it and hope for the best.
const wasCanceled = event.errorText === 'cancelled'; const wasCanceled = event.errorText.includes('cancelled');
if (!isCurrentDocument && !wasCanceled) if (!isCurrentDocument && !wasCanceled)
request.request.frame()._onAbortedNewDocumentNavigation(request._documentId, event.errorText); request.request.frame()._onAbortedNewDocumentNavigation(request._documentId, event.errorText);
} }

2
test/navigation.spec.js
View File

@ -124,7 +124,7 @@ module.exports.addTests = function({testRunner, expect, playwright, FFOX, CHROME
const response = await page.goto(server.EMPTY_PAGE, {waitUntil: 'domcontentloaded'}); const response = await page.goto(server.EMPTY_PAGE, {waitUntil: 'domcontentloaded'});
expect(response.status()).toBe(200); expect(response.status()).toBe(200);
}); });
it('should work when page calls history API in beforeunload', async({page, server}) => { it.skip(WEBKIT)('should work when page calls history API in beforeunload', async({page, server}) => {
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.evaluate(() => { await page.evaluate(() => {
window.addEventListener('beforeunload', () => history.replaceState(null, 'initial', window.location.href), false); window.addEventListener('beforeunload', () => history.replaceState(null, 'initial', window.location.href), false);