From ff5f241b84a83efdd3b40037160def9c3509ff1c Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Tue, 9 Aug 2022 23:18:15 +0200
Subject: [PATCH] chore: set --allow-pre-commit-input flag on Android/Electron
 (#16383)

---
 packages/playwright-core/src/server/android/android.ts   | 9 ++++++++-
 packages/playwright-core/src/server/chromium/chromium.ts | 2 +-
 tests/electron/electron-app.js                           | 3 +++
 tests/page/locator-convenience.spec.ts                   | 4 +---
 tests/page/page-keyboard.spec.ts                         | 7 +++++++
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/playwright-core/src/server/android/android.ts b/packages/playwright-core/src/server/android/android.ts
index c0643cc06a..3b22519a2e 100644
--- a/packages/playwright-core/src/server/android/android.ts
+++ b/packages/playwright-core/src/server/android/android.ts
@@ -35,6 +35,7 @@ import { gracefullyCloseSet } from '../../utils/processLauncher';
 import { TimeoutSettings } from '../../common/timeoutSettings';
 import type * as channels from '../../protocol/channels';
 import { SdkObject, serverSideCallMetadata } from '../instrumentation';
+import { DEFAULT_ARGS } from '../chromium/chromium';
 
 const ARTIFACTS_FOLDER = path.join(os.tmpdir(), 'playwright-artifacts-');
 
@@ -247,7 +248,13 @@ export class AndroidDevice extends SdkObject {
     debug('pw:android')('Force-stopping', pkg);
     await this._backend.runCommand(`shell:am force-stop ${pkg}`);
     const socketName = isUnderTest() ? 'webview_devtools_remote_playwright_test' : ('playwright-' + createGuid());
-    const commandLine = `_ --disable-fre --no-default-browser-check --no-first-run --remote-debugging-socket-name=${socketName}`;
+    const commandLine = [
+      '_',
+      '--disable-fre',
+      '--no-default-browser-check',
+      `--remote-debugging-socket-name=${socketName}`,
+      ...DEFAULT_ARGS,
+    ].join(' ');
     debug('pw:android')('Starting', pkg, commandLine);
     await this._backend.runCommand(`shell:echo "${commandLine}" > /data/local/tmp/chrome-command-line`);
     await this._backend.runCommand(`shell:am start -a android.intent.action.VIEW -d about:blank ${pkg}`);
diff --git a/packages/playwright-core/src/server/chromium/chromium.ts b/packages/playwright-core/src/server/chromium/chromium.ts
index 72805c5514..b3dec070ab 100644
--- a/packages/playwright-core/src/server/chromium/chromium.ts
+++ b/packages/playwright-core/src/server/chromium/chromium.ts
@@ -324,7 +324,7 @@ export class Chromium extends BrowserType {
   }
 }
 
-const DEFAULT_ARGS = [
+export const DEFAULT_ARGS = [
   '--disable-field-trial-config', // https://source.chromium.org/chromium/chromium/src/+/main:testing/variations/README.md
   '--disable-background-networking',
   '--enable-features=NetworkService,NetworkServiceInProcess',
diff --git a/tests/electron/electron-app.js b/tests/electron/electron-app.js
index 0e68871199..c2faa9644d 100644
--- a/tests/electron/electron-app.js
+++ b/tests/electron/electron-app.js
@@ -1,6 +1,9 @@
 const { app, protocol } = require('electron');
 const path = require('path');
 
+app.commandLine.appendSwitch('disable-features', 'AutoExpandDetailsElement');
+app.commandLine.appendSwitch('allow-pre-commit-input')
+
 app.on('window-all-closed', e => e.preventDefault());
 
 app.whenReady().then(() => {
diff --git a/tests/page/locator-convenience.spec.ts b/tests/page/locator-convenience.spec.ts
index 9dea5580a6..160702bfbe 100644
--- a/tests/page/locator-convenience.spec.ts
+++ b/tests/page/locator-convenience.spec.ts
@@ -202,10 +202,8 @@ it('allInnerTexts should work', async ({ page }) => {
   expect(await page.locator('div').allInnerTexts()).toEqual(['A', 'B', 'C']);
 });
 
-it('isVisible and isHidden should work with details', async ({ page, isAndroid, isElectron }) => {
+it('isVisible and isHidden should work with details', async ({ page }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/10674' });
-  it.skip(isElectron, 'We don\'t disable the AutoExpandDetailsElement feature on Electron');
-  it.skip(isAndroid, 'We can\'t disable the AutoExpandDetailsElement feature on Android');
   await page.setContent(`<details>
     <summary>click to open</summary>
       <ul>
diff --git a/tests/page/page-keyboard.spec.ts b/tests/page/page-keyboard.spec.ts
index af2833d0f2..e5ca0bd090 100644
--- a/tests/page/page-keyboard.spec.ts
+++ b/tests/page/page-keyboard.spec.ts
@@ -379,6 +379,13 @@ it('should press the meta key', async ({ page, browserName, isMac }) => {
 
 });
 
+it('should work with keyboard events with empty.html', async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/empty.html');
+  const lastEvent = await captureLastKeydown(page);
+  await page.keyboard.press('a');
+  expect(await lastEvent.evaluate(l => l.key)).toBe('a');
+});
+
 it('should work after a cross origin navigation', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/empty.html');
   await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');