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

cherry-pick(release-1.12): roll Firefox to r1271 (#7075)

Browse source 
Cherry-Pick #7067 SHA d6831df26f

NOTE: this cherry-pick updates only firefox-stable build revision
and keeps the firefox-beta as-is since it's been rolled already.
Thus, the new test is explicitly skipped on firefox-beta.

Fixes #7015
This commit is contained in:
Andrey Lushnikov 2021-06-11 11:10:49 -07:00 committed by GitHub
parent e13965e0d5
commit 6ad4e7a58f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browsers.json
View file

@ -8,7 +8,7 @@
}, },
{ {
"name": "firefox", "name": "firefox",
"revision": "1269", "revision": "1271",
"installByDefault": true "installByDefault": true
}, },
{ {

8
src/server/firefox/protocol.ts
View file

@ -276,6 +276,11 @@ export module Protocol {
reducedMotion: ("reduce"|"no-preference")|null; reducedMotion: ("reduce"|"no-preference")|null;
}; };
export type setReducedMotionReturnValue = void; export type setReducedMotionReturnValue = void;
export type setForcedColorsParameters = {
browserContextId?: string;
forcedColors: ("active"|"none")|null;
};
export type setForcedColorsReturnValue = void;
export type setVideoRecordingOptionsParameters = { export type setVideoRecordingOptionsParameters = {
browserContextId?: string; browserContextId?: string;
dir: string; dir: string;
@ -486,6 +491,7 @@ export module Protocol {
type?: ("screen"|"print"|""); type?: ("screen"|"print"|"");
colorScheme?: ("dark"|"light"|"no-preference"); colorScheme?: ("dark"|"light"|"no-preference");
reducedMotion?: ("reduce"|"no-preference"); reducedMotion?: ("reduce"|"no-preference");
forcedColors?: ("active"|"none");
}; };
export type setEmulatedMediaReturnValue = void; export type setEmulatedMediaReturnValue = void;
export type setCacheDisabledParameters = { export type setCacheDisabledParameters = {
@ -1066,6 +1072,7 @@ export module Protocol {
"Browser.setOnlineOverride": Browser.setOnlineOverrideParameters; "Browser.setOnlineOverride": Browser.setOnlineOverrideParameters;
"Browser.setColorScheme": Browser.setColorSchemeParameters; "Browser.setColorScheme": Browser.setColorSchemeParameters;
"Browser.setReducedMotion": Browser.setReducedMotionParameters; "Browser.setReducedMotion": Browser.setReducedMotionParameters;
"Browser.setForcedColors": Browser.setForcedColorsParameters;
"Browser.setVideoRecordingOptions": Browser.setVideoRecordingOptionsParameters; "Browser.setVideoRecordingOptions": Browser.setVideoRecordingOptionsParameters;
"Page.close": Page.closeParameters; "Page.close": Page.closeParameters;
"Page.setFileInputFiles": Page.setFileInputFilesParameters; "Page.setFileInputFiles": Page.setFileInputFilesParameters;
@ -1141,6 +1148,7 @@ export module Protocol {
"Browser.setOnlineOverride": Browser.setOnlineOverrideReturnValue; "Browser.setOnlineOverride": Browser.setOnlineOverrideReturnValue;
"Browser.setColorScheme": Browser.setColorSchemeReturnValue; "Browser.setColorScheme": Browser.setColorSchemeReturnValue;
"Browser.setReducedMotion": Browser.setReducedMotionReturnValue; "Browser.setReducedMotion": Browser.setReducedMotionReturnValue;
"Browser.setForcedColors": Browser.setForcedColorsReturnValue;
"Browser.setVideoRecordingOptions": Browser.setVideoRecordingOptionsReturnValue; "Browser.setVideoRecordingOptions": Browser.setVideoRecordingOptionsReturnValue;
"Page.close": Page.closeReturnValue; "Page.close": Page.closeReturnValue;
"Page.setFileInputFiles": Page.setFileInputFilesReturnValue; "Page.setFileInputFiles": Page.setFileInputFilesReturnValue;

7
tests/page/page-evaluate.spec.ts
View file

@ -556,6 +556,13 @@ it('should not use Array.prototype.toJSON when evaluating', async ({ page, brows
expect(result).toEqual([1,2,3]); expect(result).toEqual([1,2,3]);
}); });
it('should not add a toJSON property to newly created Arrays after evaluation', async ({ page, browserName, channel }) => {
it.fixme(browserName === 'firefox' && channel === 'firefox-beta')
await page.evaluate(() => []);
const hasToJSONProperty = await page.evaluate(() => "toJSON" in []);
expect(hasToJSONProperty).toEqual(false);
});
it('should not use toJSON in jsonValue', async ({ page }) => { it('should not use toJSON in jsonValue', async ({ page }) => {
const resultHandle = await page.evaluateHandle(() => ({ toJSON: () => 'string', data: 'data' })); const resultHandle = await page.evaluateHandle(() => ({ toJSON: () => 'string', data: 'data' }));
expect(await resultHandle.jsonValue()).toEqual({ data: 'data', toJSON: {} }); expect(await resultHandle.jsonValue()).toEqual({ data: 'data', toJSON: {} });