mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: handle Browser.close over CDP (#23436)

Browse source
This commit is contained in:
Pavel Feldman 2020-05-08 16:13:32 -07:00 • committed by GitHub
parent 091f45b879
commit 3c132dc445
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
spec-main/chromium-spec.ts
View file

@ -248,13 +248,20 @@ describe('web security', () => {
});
describe('command line switches', () => {
let appProcess: ChildProcess.ChildProcessWithoutNullStreams | undefined;
afterEach(() => {
if (appProcess && !appProcess.killed) {
appProcess.kill();
appProcess = undefined;
}
});
describe('--lang switch', () => {
const currentLocale = app.getLocale();
const testLocale = (locale: string, result: string, done: () => void) => {
const appPath = path.join(fixturesPath, 'api', 'locale-check');
const electronPath = process.execPath;
let output = '';
const appProcess = ChildProcess.spawn(electronPath, [appPath, `--lang=${locale}`]);
appProcess = ChildProcess.spawn(electronPath, [appPath, `--lang=${locale}`]);
appProcess.stdout.on('data', (data) => { output += data; });
appProcess.stdout.on('end', () => {
@ -271,7 +278,7 @@ describe('command line switches', () => {
describe('--remote-debugging-pipe switch', () => {
it('should expose CDP via pipe', async () => {
const electronPath = process.execPath;
const appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-pipe'], {
appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-pipe'], {
stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe']
});
const stdio = appProcess.stdio as unknown as [NodeJS.ReadableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.ReadableStream];
@ -282,15 +289,14 @@ describe('command line switches', () => {
expect(message.id).to.equal(1);
expect(message.result.product).to.contain('Chrome');
expect(message.result.userAgent).to.contain('Electron');
appProcess.kill();
});
it('should override --remote-debugging-port switch', async () => {
const electronPath = process.execPath;
const appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-pipe', '--remote-debugging-port=0'], {
appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-pipe', '--remote-debugging-port=0'], {
stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe']
});
let stderr = '';
appProcess.stderr.on('data', (data) => { stderr += data; });
appProcess.stderr.on('data', (data: string) => { stderr += data; });
const stdio = appProcess.stdio as unknown as [NodeJS.ReadableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.ReadableStream];
const pipe = new PipeTransport(stdio[3], stdio[4]);
const versionPromise = new Promise(resolve => { pipe.onmessage = resolve; });
@ -298,7 +304,16 @@ describe('command line switches', () => {
const message = (await versionPromise) as any;
expect(message.id).to.equal(1);
expect(stderr).to.not.include('DevTools listening on');
appProcess.kill();
});
it('should shut down Electron upon Browser.close CDP command', async () => {
const electronPath = process.execPath;
appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-pipe'], {
stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe']
});
const stdio = appProcess.stdio as unknown as [NodeJS.ReadableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.ReadableStream];
const pipe = new PipeTransport(stdio[3], stdio[4]);
pipe.send({ id: 1, method: 'Browser.close', params: {} });
await new Promise(resolve => { appProcess!.on('exit', resolve); });
});
});
@ -306,17 +321,16 @@ describe('command line switches', () => {
it('should display the discovery page', (done) => {
const electronPath = process.execPath;
let output = '';
const appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-port=']);
appProcess = ChildProcess.spawn(electronPath, ['--remote-debugging-port=']);
appProcess.stderr.on('data', (data) => {
output += data;
const m = /DevTools listening on ws:\/\/127.0.0.1:(\d+)\//.exec(output);
if (m) {
appProcess.stderr.removeAllListeners('data');
appProcess!.stderr.removeAllListeners('data');
const port = m[1];
http.get(`http://127.0.0.1:${port}`, (res) => {
res.destroy();
appProcess.kill();
expect(res.statusCode).to.eql(200);
expect(parseInt(res.headers['content-length']!)).to.be.greaterThan(0);
done();