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

fix(electron): allow launching with spaces in path (#30820)

Browse Source 
Fixes https://github.com/microsoft/playwright/issues/30755
This commit is contained in:
Max Schmitt 2024-05-15 18:20:00 +02:00 committed by GitHub
parent 6ae5cd3824
commit 90765a226f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/playwright-core/src/server/electron/electron.ts
View File

@ -161,7 +161,7 @@ export class Electron extends SdkObject {
return controller.run(async progress => { return controller.run(async progress => {
let app: ElectronApplication | undefined = undefined; let app: ElectronApplication | undefined = undefined;
// --remote-debugging-port=0 must be the last playwright's argument, loader.ts relies on it. // --remote-debugging-port=0 must be the last playwright's argument, loader.ts relies on it.
const electronArguments = ['--inspect=0', '--remote-debugging-port=0', ...args]; let electronArguments = ['--inspect=0', '--remote-debugging-port=0', ...args];
if (os.platform() === 'linux') { if (os.platform() === 'linux') {
const runningAsRoot = process.geteuid && process.geteuid() === 0; const runningAsRoot = process.geteuid && process.geteuid() === 0;
@ -195,6 +195,16 @@ export class Electron extends SdkObject {
// Packaged apps might have their own command line handling. // Packaged apps might have their own command line handling.
electronArguments.unshift('-r', require.resolve('./loader')); electronArguments.unshift('-r', require.resolve('./loader'));
} }
let shell = false;
if (process.platform === 'win32') {
// On Windows in order to run .cmd files, shell: true is required.
// https://github.com/nodejs/node/issues/52554
shell = true;
// On Windows, we need to quote the executable path due to shell: true.
command = `"${command}"`;
// On Windows, we need to quote the arguments due to shell: true.
electronArguments = electronArguments.map(arg => `"${arg}"`);
}
// When debugging Playwright test that runs Electron, NODE_OPTIONS // When debugging Playwright test that runs Electron, NODE_OPTIONS
// will make the debugger attach to Electron's Node. But Playwright // will make the debugger attach to Electron's Node. But Playwright
@ -208,9 +218,7 @@ export class Electron extends SdkObject {
progress.log(message); progress.log(message);
browserLogsCollector.log(message); browserLogsCollector.log(message);
}, },
// On Windows in order to run .cmd files, shell: true is required. shell,
// https://github.com/nodejs/node/issues/52554
shell: process.platform === 'win32',
stdio: 'pipe', stdio: 'pipe',
cwd: options.cwd, cwd: options.cwd,
tempDirectories: [artifactsDir], tempDirectories: [artifactsDir],

15
tests/installation/playwright-electron-should-work.spec.ts
View File

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
import { test } from './npmTest'; import { test } from './npmTest';
import fs from 'fs';
import path from 'path';
test('electron should work', async ({ exec, tsc, writeFiles }) => { test('electron should work', async ({ exec, tsc, writeFiles }) => {
await exec('npm i playwright electron@19.0.11'); await exec('npm i playwright electron@19.0.11');
@ -24,3 +26,16 @@ test('electron should work', async ({ exec, tsc, writeFiles }) => {
}); });
await tsc('test.ts'); await tsc('test.ts');
}); });
test('electron should work with special characters in path', async ({ exec, tmpWorkspace }) => {
test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30755' });
const folderName = path.join(tmpWorkspace, '!@#$% тест with spaces and 😊');
await exec('npm i playwright electron@19.0.11');
await fs.promises.mkdir(folderName);
for (const file of ['electron-app.js', 'sanity-electron.js'])
await fs.promises.copyFile(path.join(tmpWorkspace, file), path.join(folderName, file));
await exec('node sanity-electron.js', {
cwd: path.join(folderName)
});
});