mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Avoid calling tray.destroy() when quitting

Browse source
This commit is contained in:
Fedor Indutny 2022-01-24 16:18:53 -08:00 • committed by GitHub
parent dff941adc7
commit 3aa488c3d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ts/test-node/app/SystemTrayService_test.ts
View file

@ -8,6 +8,7 @@ import { BrowserWindow, Tray, nativeImage } from 'electron';
import * as path from 'path';
import { MINUTE } from '../../util/durations';
import type { SystemTrayServiceOptionsType } from '../../../app/SystemTrayService';
import { SystemTrayService } from '../../../app/SystemTrayService';
describe('SystemTrayService', function thisNeeded() {
@ -23,7 +24,9 @@ describe('SystemTrayService', function thisNeeded() {
*
* This only affects these tests, not the "real" code.
*/
function newService(): SystemTrayService {
function newService(
options?: Partial<SystemTrayServiceOptionsType>
): SystemTrayService {
const result = new SystemTrayService({
messages: {
hide: { message: 'Hide' },
@ -31,6 +34,7 @@ describe('SystemTrayService', function thisNeeded() {
show: { message: 'Show' },
signalDesktop: { message: 'Signal' },
},
...options,
});
servicesCreated.add(result);
return result;
@ -258,4 +262,16 @@ describe('SystemTrayService', function thisNeeded() {
sinon.assert.calledWith(setImageStub, sinon.match.string);
sinon.assert.calledWith(setImageStub, sinon.match.instanceOf(NativeImage));
});
it('should not create new Tray after markShouldQuit', () => {
const createTrayInstance = sandbox.stub();
const service = newService({ createTrayInstance });
service.setMainWindow(new BrowserWindow({ show: false }));
service.markShouldQuit();
service.setEnabled(true);
sinon.assert.notCalled(createTrayInstance);
});
});