Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(watch): cancel waitForCommand when files change (#32761)

Browse source 
Fixes https://github.com/microsoft/playwright/issues/32758
This commit is contained in:
Max Schmitt 2024-09-23 14:43:28 +02:00 committed by GitHub
parent b3a82bef46
commit 12ecd476dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/playwright/src/runner/watchMode.ts
View file

@ -144,11 +144,13 @@ export async function runWatchModeLoop(configLocation: ConfigLocation, initialOp
else else
printPrompt(); printPrompt();
const waitForCommand = readCommand();
const command = await Promise.race([ const command = await Promise.race([
onDirtyTests, onDirtyTests,
readCommand(), waitForCommand.result,
]); ]);
if (command === 'changed')
waitForCommand.cancel();
if (bufferMode && command === 'changed') if (bufferMode && command === 'changed')
continue; continue;
@ -282,7 +284,7 @@ async function runTests(watchOptions: WatchModeOptions, testServerConnection: Te
}); });
} }
function readCommand(): ManualPromise<Command> { function readCommand(): { result: Promise<Command>, cancel: () => void } {
const result = new ManualPromise<Command>(); const result = new ManualPromise<Command>();
const rl = readline.createInterface({ input: process.stdin, escapeCodeTimeout: 50 }); const rl = readline.createInterface({ input: process.stdin, escapeCodeTimeout: 50 });
readline.emitKeypressEvents(process.stdin, rl); readline.emitKeypressEvents(process.stdin, rl);
@ -334,13 +336,14 @@ Change settings
}; };
process.stdin.on('keypress', handler); process.stdin.on('keypress', handler);
void result.finally(() => { const cancel = () => {
process.stdin.off('keypress', handler); process.stdin.off('keypress', handler);
rl.close(); rl.close();
if (process.stdin.isTTY) if (process.stdin.isTTY)
process.stdin.setRawMode(false); process.stdin.setRawMode(false);
}); };
return result; void result.finally(cancel);
return { result, cancel };
} }
let showBrowserServer: PlaywrightServer | undefined; let showBrowserServer: PlaywrightServer | undefined;