phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-43632] Ensure handleURLView is called when removing the target URL (#2074)

Browse Source
This commit is contained in:
Devin Binnie
2022-04-25 17:18:23 -04:00
committed by GitHub
parent 9b3d37e953
commit 90576570e2
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/views/MattermostView.test.js
View File

@@ -315,7 +315,13 @@ describe('main/views/MattermostView', () => {
it('should not emit tooltip URL if internal', () => { it('should not emit tooltip URL if internal', () => {
mattermostView.handleUpdateTarget(null, 'http://server-1.com/path/to/channels'); mattermostView.handleUpdateTarget(null, 'http://server-1.com/path/to/channels');
expect(mattermostView.emit).not.toHaveBeenCalled(); expect(mattermostView.emit).toHaveBeenCalled();
expect(mattermostView.emit).not.toHaveBeenCalledWith(UPDATE_TARGET_URL, 'http://server-1.com/path/to/channels');
});
it('should still emit even if URL is blank', () => {
mattermostView.handleUpdateTarget(null, '');
expect(mattermostView.emit).toHaveBeenCalled();
}); });
}); });

2
src/main/views/MattermostView.ts
View File

@@ -360,6 +360,8 @@ export class MattermostView extends EventEmitter {
log.silly('MattermostView.handleUpdateTarget', {tabName: this.tab.name, url}); log.silly('MattermostView.handleUpdateTarget', {tabName: this.tab.name, url});
if (url && !urlUtils.isInternalURL(urlUtils.parseURL(url), this.tab.server.url)) { if (url && !urlUtils.isInternalURL(urlUtils.parseURL(url), this.tab.server.url)) {
this.emit(UPDATE_TARGET_URL, url); this.emit(UPDATE_TARGET_URL, url);
} else {
this.emit(UPDATE_TARGET_URL);
} }
} }