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

browser(firefox): fix file chooser in iframes #8510 (#8510)

Browse Source 
References #8016
This commit is contained in:
Andrey Lushnikov 2021-08-27 19:28:24 +03:00 committed by GitHub
parent 768a97cfdc
commit 5901cb321d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser_patches/firefox-beta/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1284 1285
Changed: lushnikov@chromium.org Wed 25 Aug 2021 08:50:22 AM PDT Changed: lushnikov@chromium.org Fri 27 Aug 2021 09:23:19 AM PDT

4
browser_patches/firefox-beta/juggler/content/PageAgent.js
View File

@ -246,9 +246,9 @@ class PageAgent {
} }
_filePickerShown(inputElement) { _filePickerShown(inputElement) {
if (inputElement.ownerGlobal.docShell !== this._docShell)
return;
const frame = this._findFrameForNode(inputElement); const frame = this._findFrameForNode(inputElement);
if (!frame)
return;
this._browserPage.emit('pageFileChooserOpened', { this._browserPage.emit('pageFileChooserOpened', {
executionContextId: frame.mainExecutionContext().id(), executionContextId: frame.mainExecutionContext().id(),
element: frame.mainExecutionContext().rawValueToRemoteObject(inputElement) element: frame.mainExecutionContext().rawValueToRemoteObject(inputElement)

4
browser_patches/firefox/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1288 1289
Changed: joel.einbinder@gmail.com Wed 25 Aug 2021 08:41:36 AM PDT Changed: lushnikov@chromium.org Fri 27 Aug 2021 09:23:19 AM PDT

4
browser_patches/firefox/juggler/content/PageAgent.js
View File

@ -246,9 +246,9 @@ class PageAgent {
} }
_filePickerShown(inputElement) { _filePickerShown(inputElement) {
if (inputElement.ownerGlobal.docShell !== this._docShell)
return;
const frame = this._findFrameForNode(inputElement); const frame = this._findFrameForNode(inputElement);
if (!frame)
return;
this._browserPage.emit('pageFileChooserOpened', { this._browserPage.emit('pageFileChooserOpened', {
executionContextId: frame.mainExecutionContext().id(), executionContextId: frame.mainExecutionContext().id(),
element: frame.mainExecutionContext().rawValueToRemoteObject(inputElement) element: frame.mainExecutionContext().rawValueToRemoteObject(inputElement)

12
tests/page/page-set-input-files.spec.ts
View File

@ -16,6 +16,7 @@
*/ */
import { test as it, expect } from './pageTest'; import { test as it, expect } from './pageTest';
import { attachFrame } from '../config/utils';
import path from 'path'; import path from 'path';
import fs from 'fs'; import fs from 'fs';
@ -69,6 +70,17 @@ it('should emit event once', async ({page, server}) => {
expect(chooser).toBeTruthy(); expect(chooser).toBeTruthy();
}); });
it('should emit event for iframe', async ({page, server, browserName}) => {
it.skip(browserName === 'firefox');
const frame = await attachFrame(page, 'frame1', server.EMPTY_PAGE);
await frame.setContent(`<input type=file>`);
const [chooser] = await Promise.all([
new Promise(f => page.once('filechooser', f)),
frame.click('input'),
]);
expect(chooser).toBeTruthy();
});
it('should emit event on/off', async ({page, server}) => { it('should emit event on/off', async ({page, server}) => {
await page.setContent(`<input type=file>`); await page.setContent(`<input type=file>`);
const [chooser] = await Promise.all([ const [chooser] = await Promise.all([