Skip to content

Commit

Permalink
cherry-pick(#30820): fix(electron): allow launching with spaces in pa…
Browse files Browse the repository at this point in the history
…th (#30830)

This PR cherry-picks the following commits:

- 90765a2

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
playwrightmachine and github-actions[bot] authored May 15, 2024
1 parent 01bf93c commit 3867d55
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
16 changes: 12 additions & 4 deletions packages/playwright-core/src/server/electron/electron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export class Electron extends SdkObject {
return controller.run(async progress => {
let app: ElectronApplication | undefined = undefined;
// --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') {
const runningAsRoot = process.geteuid && process.geteuid() === 0;
Expand Down Expand Up @@ -195,6 +195,16 @@ export class Electron extends SdkObject {
// Packaged apps might have their own command line handling.
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
// will make the debugger attach to Electron's Node. But Playwright
Expand All @@ -208,9 +218,7 @@ export class Electron extends SdkObject {
progress.log(message);
browserLogsCollector.log(message);
},
// On Windows in order to run .cmd files, shell: true is required.
// https://github.com/nodejs/node/issues/52554
shell: process.platform === 'win32',
shell,
stdio: 'pipe',
cwd: options.cwd,
tempDirectories: [artifactsDir],
Expand Down
15 changes: 15 additions & 0 deletions tests/installation/playwright-electron-should-work.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/
import { test } from './npmTest';
import fs from 'fs';
import path from 'path';

test('electron should work', async ({ exec, tsc, writeFiles }) => {
await exec('npm i playwright electron@19.0.11');
Expand All @@ -24,3 +26,16 @@ test('electron should work', async ({ exec, tsc, writeFiles }) => {
});
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)
});
});

0 comments on commit 3867d55

Please sign in to comment.