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

Bullet-proof tray icon against nonexistent icon file

Browse source
This commit is contained in:
Evan Hahn 2021-10-07 15:09:56 -05:00 • committed by GitHub
parent 99b19d4b80
commit 940f009987
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { BrowserWindow, MenuItem, Tray } from 'electron';
import { BrowserWindow, MenuItem, Tray, nativeImage } from 'electron';
import * as path from 'path';
import { SystemTrayService } from '../../../app/SystemTrayService';
@ -208,9 +208,9 @@ describe('SystemTrayService', () => {
// Ideally, there'd be something like `tray.getImage`, but that doesn't exist. We also
// can't spy on `Tray.prototype.setImage` because it's not defined that way. So we
// spy on the specific instance, just to get the image.
const setContextMenuSpy = sandbox.spy(tray, 'setImage');
const setImageSpy = sandbox.spy(tray, 'setImage');
const getImagePath = (): string => {
const result = setContextMenuSpy.lastCall?.firstArg;
const result = setImageSpy.lastCall?.firstArg;
if (!result) {
throw new Error('Expected tray.setImage to be called at least once');
}
@ -230,4 +230,27 @@ describe('SystemTrayService', () => {
service.setUnreadCount(0);
assert.match(path.parse(getImagePath()).base, /^icon_\d+\.png$/);
});
it('uses a fallback image if the icon file cannot be found', () => {
const service = newService();
service.setEnabled(true);
service.setMainWindow(new BrowserWindow({ show: false }));
const tray = service._getTray();
if (!tray) {
throw new Error('Test setup failed: expected a tray');
}
const setImageStub = sandbox.stub(tray, 'setImage');
setImageStub.withArgs(sinon.match.string).throws('Failed to load');
service.setUnreadCount(4);
// Electron doesn't export this class, so we have to wrestle it out.
const NativeImage = nativeImage.createEmpty().constructor;
sinon.assert.calledTwice(setImageStub);
sinon.assert.calledWith(setImageStub, sinon.match.string);
sinon.assert.calledWith(setImageStub, sinon.match.instanceOf(NativeImage));
});
});