diff --git a/package.json b/package.json index d278793451e99..3390616c1b97e 100644 --- a/package.json +++ b/package.json @@ -141,4 +141,4 @@ "node script/gen-hunspell-filenames.js" ] } -} \ No newline at end of file +} diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts index 42dcc7c037709..b67bac74ad002 100644 --- a/spec-main/api-app-spec.ts +++ b/spec-main/api-app-spec.ts @@ -218,6 +218,7 @@ describe('app module', () => { await emittedOnce(first.stdout, 'data'); // Start second app when received output. const second = cp.spawn(process.execPath, [appPath]); + const [code2] = await emittedOnce(second, 'exit'); expect(code2).to.equal(1); const [code1] = await emittedOnce(first, 'exit'); @@ -238,9 +239,11 @@ describe('app module', () => { const secondInstanceArgs = [process.execPath, appPath, ...testArgs.args, '--some-switch', 'some-arg']; const second = cp.spawn(secondInstanceArgs[0], secondInstanceArgs.slice(1)); const secondStdoutLines = second.stdout.pipe(split()); - const dataAckPromise = emittedOnce(secondStdoutLines, 'data'); + let ackData; + while ((ackData = await emittedOnce(secondStdoutLines, 'data'))[0].toString().length === 0) { + // This isn't valid data. + } - const ackData = await dataAckPromise; const [code2] = await emittedOnce(second, 'exit'); expect(code2).to.equal(1); const [code1] = await emittedOnce(first, 'exit'); @@ -312,14 +315,6 @@ describe('app module', () => { }); }); - it('gets back an empty ack by default', async () => { - await testArgumentPassing({ - args: ['--send-ack'], - expectedAdditionalData: null, - expectedAck: null - }); - }); - it('sends and receives data', async () => { await testArgumentPassing({ args: ['--send-ack', '--prevent-default', '--send-data'], diff --git a/spec/fixtures/api/singleton-data/main.js b/spec/fixtures/api/singleton-data/main.js index a84fddb40616f..e1ba175f3669a 100644 --- a/spec/fixtures/api/singleton-data/main.js +++ b/spec/fixtures/api/singleton-data/main.js @@ -44,7 +44,9 @@ app.on('second-instance', (event, args, workingDirectory, data, ackCallback) => setImmediate(() => { console.log([JSON.stringify(args), JSON.stringify(data)].join('||')); sendAck ? ackCallback(ackObj) : ackCallback(); - app.exit(0); + setImmediate(() => { + app.exit(0); + }); }); });