microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-09-20 16:58:47 +03:00
Code Issues Projects Releases Wiki Activity

fix(webkit): fix ordering of provisional messages relative to the rest (#225)

Browse Source
This commit is contained in:
Dmitry Gozman 2019-12-12 08:59:08 -08:00 committed by Yury Semikhatsky
parent cca2659578
commit 3c7181a545
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/webkit/Connection.ts
View File

@ -88,8 +88,9 @@ export class Connection extends EventEmitter {
this._scheduleQueueDispatch();
}
private _enqueueMessages(messages: string[]) {
this._incomingMessageQueue = this._incomingMessageQueue.concat(messages);
private _enqueueProvisionalMessages(messages: string[]) {
// Insert provisional messages at the point of "Target.didCommitProvisionalTarget" message.
this._incomingMessageQueue = messages.concat(this._incomingMessageQueue);
this._scheduleQueueDispatch();
}
@ -169,7 +170,7 @@ export class Connection extends EventEmitter {
if (!oldSession)
throw new Error('Unknown old target: ' + oldTargetId);
oldSession._swappedOut = true;
this._enqueueMessages(newSession._takeProvisionalMessagesAndCommit());
this._enqueueProvisionalMessages(newSession._takeProvisionalMessagesAndCommit());
}
}

50
test/navigation.spec.js
View File

@ -27,6 +27,56 @@ module.exports.addTests = function({testRunner, expect, playwright, FFOX, CHROME
await page.goto(server.EMPTY_PAGE);
expect(page.url()).toBe(server.EMPTY_PAGE);
});
it('should work cross-process', async({page, server}) => {
await page.goto(server.EMPTY_PAGE);
expect(page.url()).toBe(server.EMPTY_PAGE);
const url = server.CROSS_PROCESS_PREFIX + '/empty.html';
let requestFrame;
page.on('request', r => {
if (r.url() === url)
requestFrame = r.frame();
});
const response = await page.goto(url);
expect(page.url()).toBe(url);
expect(response.frame()).toBe(page.mainFrame());
expect(requestFrame).toBe(page.mainFrame());
expect(response.url()).toBe(url);
});
it('should capture iframe navigation request', async({page, server}) => {
await page.goto(server.EMPTY_PAGE);
expect(page.url()).toBe(server.EMPTY_PAGE);
const iframeUrl = server.PREFIX + '/frame.html';
let requestFrame;
page.on('request', r => {
if (r.url() === iframeUrl)
requestFrame = r.frame();
});
const response = await page.goto(server.PREFIX + '/one-frame.html');
expect(page.url()).toBe(server.PREFIX + '/one-frame.html');
expect(response.frame()).toBe(page.mainFrame());
expect(response.url()).toBe(server.PREFIX + '/one-frame.html');
expect(requestFrame).toBe(page.frames()[1]);
});
it('should capture cross-process iframe navigation request', async({page, server}) => {
await page.goto(server.EMPTY_PAGE);
expect(page.url()).toBe(server.EMPTY_PAGE);
const iframeUrl = server.CROSS_PROCESS_PREFIX + '/frame.html';
let requestFrame;
page.on('request', r => {
if (r.url() === iframeUrl)
requestFrame = r.frame();
});
const response = await page.goto(server.CROSS_PROCESS_PREFIX + '/one-frame.html');
expect(page.url()).toBe(server.CROSS_PROCESS_PREFIX + '/one-frame.html');
expect(response.frame()).toBe(page.mainFrame());
expect(response.url()).toBe(server.CROSS_PROCESS_PREFIX + '/one-frame.html');
expect(requestFrame).toBe(page.frames()[1]);
});
it('should work with anchor navigation', async({page, server}) => {
await page.goto(server.EMPTY_PAGE);
expect(page.url()).toBe(server.EMPTY_PAGE);