microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-12-03 07:51:12 +03:00
Code Issues Projects Releases Wiki Activity

feat(firefox): roll ff to 1350, beta to 1353 (#17006)

Browse Source
This commit is contained in:
Dmitry Gozman 2022-09-02 08:35:29 -07:00 committed by GitHub
parent da19219323
commit 3548f3f898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/playwright-core/browsers.json
View File

@ -21,15 +21,15 @@
},
{
"name": "firefox",
"revision": "1347",
"revision": "1350",
"installByDefault": true,
"browserVersion": "104.0"
},
{
"name": "firefox-beta",
"revision": "1348",
"revision": "1353",
"installByDefault": false,
"browserVersion": "104.0b5"
"browserVersion": "105.0b2"
},
{
"name": "webkit",

4
packages/playwright-core/src/server/firefox/ffBrowser.ts
View File

@ -122,6 +122,10 @@ export class FFBrowser extends Browser {
assert(ffPage);
if (!ffPage)
return;
// Abort the navigation that turned into download.
ffPage._page._frameManager.frameAbortedNavigation(payload.frameId, 'Download is starting');
let originPage = ffPage._initializedPage;
// If it's a new window download, report it on the opener page.
if (!originPage) {

3
packages/playwright-core/src/server/firefox/protocol.d.ts vendored
View File

@ -57,6 +57,7 @@ export module Protocol {
uuid: string;
browserContextId?: string;
pageTargetId: string;
frameId: string;
url: string;
suggestedFileName: string;
}
@ -569,7 +570,7 @@ export module Protocol {
export type reloadReturnValue = void;
export type adoptNodeParameters = {
frameId: string;
objectId: string;
objectId?: string;
executionContextId: string;
};
export type adoptNodeReturnValue = {

8
tests/library/download.spec.ts
View File

@ -70,8 +70,8 @@ it.describe('download event', () => {
expect(responseOrError.message).toContain('Download is starting');
expect(page.url()).toBe('about:blank');
} else {
expect(responseOrError.status()).toBe(200);
expect(page.url()).toBe(server.PREFIX + '/download');
expect(responseOrError instanceof Error).toBeTruthy();
expect(responseOrError.message).toContain('Download is starting');
}
await page.close();
});
@ -96,8 +96,8 @@ it.describe('download event', () => {
expect(responseOrError.message).toContain('Download is starting');
expect(page.url()).toBe('about:blank');
} else {
expect(responseOrError.status()).toBe(200);
expect(page.url()).toBe(server.PREFIX + '/downloadWithCOOP');
expect(responseOrError instanceof Error).toBeTruthy();
expect(responseOrError.message).toContain('Download is starting');
}
await page.close();
});

6
tests/page/page-goto.spec.ts
View File

@ -630,19 +630,21 @@ it('should properly wait for load', async ({ page, server, browserName }) => {
});
it('should not resolve goto upon window.stop()', async ({ browserName, page, server }) => {
it.fixme(browserName === 'firefox', 'load/domcontentloaded events are flaky');
let response;
server.setRoute('/module.js', (req, res) => {
res.writeHead(200, { 'Content-Type': 'text/javascript' });
response = res;
});
let done = false;
page.goto(server.PREFIX + '/window-stop.html').then(() => done = true).catch(() => {});
const promise = page.goto(server.PREFIX + '/window-stop.html').then(() => done = true).catch(() => {});
await server.waitForRequest('/module.js');
expect(done).toBe(false);
await page.waitForTimeout(1000); // give it some time to erroneously resolve
response.end('');
await page.waitForTimeout(1000); // give it more time to erroneously resolve
expect(done).toBe(browserName === 'firefox'); // Firefox fires DOMContentLoaded and load events in this case.
expect(done).toBe(false);
});
it('should return from goto if new navigation is started', async ({ page, server, browserName, isAndroid }) => {