[MM-51964] Clean up MattermostView, remove tuple in preparation for id (#2668)

undefined
This commit is contained in:
Devin Binnie
2023-04-06 11:17:33 -04:00
committed by GitHub
parent 53fb8c8fd3
commit 88eb2e2c70
14 changed files with 470 additions and 541 deletions

View File

@@ -52,12 +52,8 @@ describe('main/windows/callsWidgetWindow', () => {
};
const mainView = {
view: {
webContents: {
send: jest.fn(),
id: 'mainViewID',
},
},
sendToRenderer: jest.fn(),
webContentsId: 'mainViewID',
serverInfo: {
server: {
name: 'test-server-name',
@@ -434,12 +430,12 @@ describe('main/windows/callsWidgetWindow', () => {
widgetWindow.onJoinedCall({
sender: {id: 'badID'},
}, message);
expect(widgetWindow.mainView.view.webContents.send).not.toHaveBeenCalled();
expect(widgetWindow.mainView.sendToRenderer).not.toHaveBeenCalled();
widgetWindow.onJoinedCall({
sender: baseWindow.webContents,
}, 'widget', message);
expect(widgetWindow.mainView.view.webContents.send).toHaveBeenCalledWith(CALLS_JOINED_CALL, message);
expect(widgetWindow.mainView.sendToRenderer).toHaveBeenCalledWith(CALLS_JOINED_CALL, message);
});
it('menubar disabled on popout', () => {
@@ -589,7 +585,7 @@ describe('main/windows/callsWidgetWindow', () => {
})).toEqual(false);
expect(widgetWindow.isAllowedEvent({
sender: widgetWindow.mainView.view.webContents,
sender: {id: 'mainViewID'},
})).toEqual(true);
expect(widgetWindow.isAllowedEvent({