Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
fix(setInputFiles): wait for input event on the input when uploading a folder (#43385)
Yury Semikhatskybe8d329ef159
diff --git a/packages/playwright-core/src/server/dom.ts b/packages/playwright-core/src/server/dom.tsindex 0b9ba79460..920a6a1722 100644--- a/packages/playwright-core/src/server/dom.ts+++ b/packages/playwright-core/src/server/dom.ts@@ -773,11 +773,17 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {fs.promises.access(localPath, fs.constants.F_OK)))));// Browsers traverse the given directory asynchronously and we want to ensure all files are uploaded.- const waitForInputEvent = localDirectory ? this.evaluate(node => new Promise<any>(fulfill => {- node.addEventListener('input', fulfill, { once: true });- })).catch(() => {}) : Promise.resolve();- await this._page.delegate.setInputFilePaths(progress, retargeted, localPathsOrDirectory);- await progress.race(waitForInputEvent);+ // Install the listener on the input itself before setting the files, so that the event is not missed.+ const inputEvent = localDirectory ? await progress.race(retargeted.evaluateHandle(node => ({+ promise: new Promise<void>(fulfill => node.addEventListener('input', () => fulfill(), { once: true })),+ })).catch(() => undefined)) : undefined;+ try {+ await this._page.delegate.setInputFilePaths(progress, retargeted, localPathsOrDirectory);+ if (inputEvent)+ await progress.race(inputEvent.evaluate(event => event.promise).catch(() => {}));+ } finally {+ inputEvent?.dispose();+ }} else {await progress.race(retargeted.evaluateInUtility(([injected, node, files]) =>injected.setInputFiles(node, files), filePayloads!));diff --git a/tests/page/page-set-input-files.spec.ts b/tests/page/page-set-input-files.spec.tsindex 74fb5aa46b..e08641689f 100644--- a/tests/page/page-set-input-files.spec.ts+++ b/tests/page/page-set-input-files.spec.ts@@ -68,6 +68,20 @@ test('should upload a folder', async ({ page, server, isFrozenWebkit, isAndroid}});+test('should upload a folder via label', {+ annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/43367' },+}, async ({ page, isFrozenWebkit, isAndroid }) => {+ test.skip(isAndroid);+ test.skip(isFrozenWebkit);++ await page.setContent(`<label for="folder">Folder</label><input id="folder" type="file" webkitdirectory>`);+ const dir = path.join(test.info().outputDir, 'file-upload-test');+ await fs.promises.mkdir(dir, { recursive: true });+ await fs.promises.writeFile(path.join(dir, 'file1.txt'), 'file1 content');+ await page.getByText('Folder').setInputFiles(dir);+ expect(await page.locator('input').evaluate((e: HTMLInputElement) => [...e.files].map(f => f.webkitRelativePath))).toEqual(['file-upload-test/file1.txt']);+});+test('should upload a folder and throw for multiple directories', async ({ page, server, isAndroid, isFrozenWebkit }) => {test.skip(isAndroid);test.skip(isFrozenWebkit);