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

[MM-52333] Create Server View State module, move into new app module (#2739)

Browse Source 
* Create Server View State Module

* Move currentServerId to serverViewState

* Move view state into server view state module

* PR feedback/bug fixes
This commit is contained in:
Devin Binnie
2023-06-12 08:35:14 -04:00
committed by GitHub
parent a7c25ee95e
commit 21e3044ff2
21 changed files with 505 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/windows/callsWidgetWindow.test.js
View File

@@ -5,6 +5,8 @@
import {BrowserWindow, desktopCapturer, systemPreferences} from 'electron';
import ServerViewState from 'app/serverViewState';
import {CALLS_WIDGET_SHARE_SCREEN, CALLS_JOINED_CALL} from 'common/communication';
import {
MINIMUM_CALLS_WIDGET_WIDTH,
@@ -13,7 +15,6 @@ import {
} from 'common/utils/constants';
import urlUtils from 'common/utils/url';
import {switchServer} from 'main/app/servers';
import MainWindow from 'main/windows/mainWindow';
import ViewManager from 'main/views/viewManager';
import {
@@ -56,7 +57,7 @@ jest.mock('main/windows/mainWindow', () => ({
get: jest.fn(),
focus: jest.fn(),
}));
jest.mock('main/app/servers', () => ({
jest.mock('app/serverViewState', () => ({
switchServer: jest.fn(),
}));
jest.mock('main/views/viewManager', () => ({
@@ -810,7 +811,7 @@ describe('main/windows/callsWidgetWindow', () => {
it('should switch server', () => {
callsWidgetWindow.handleDesktopSourcesModalRequest();
expect(switchServer).toHaveBeenCalledWith('server-1');
expect(ServerViewState.switchServer).toHaveBeenCalledWith('server-1');
});
});
@@ -877,7 +878,7 @@ describe('main/windows/callsWidgetWindow', () => {
it('should switch server', () => {
callsWidgetWindow.handleCallsWidgetChannelLinkClick();
expect(switchServer).toHaveBeenCalledWith('server-2');
expect(ServerViewState.switchServer).toHaveBeenCalledWith('server-2');
});
});
@@ -903,7 +904,7 @@ describe('main/windows/callsWidgetWindow', () => {
it('should focus view and propagate error to main view', () => {
callsWidgetWindow.handleCallsError('', {err: 'client-error'});
expect(switchServer).toHaveBeenCalledWith('server-2');
expect(ServerViewState.switchServer).toHaveBeenCalledWith('server-2');
expect(focus).toHaveBeenCalled();
expect(callsWidgetWindow.mainView.sendToRenderer).toHaveBeenCalledWith('calls-error', {err: 'client-error'});
});
@@ -931,7 +932,7 @@ describe('main/windows/callsWidgetWindow', () => {
it('should pass through the click link to browser history push', () => {
callsWidgetWindow.handleCallsLinkClick('', {link: '/other/subpath'});
expect(switchServer).toHaveBeenCalledWith('server-1');
expect(ServerViewState.switchServer).toHaveBeenCalledWith('server-1');
expect(view.sendToRenderer).toBeCalledWith('browser-history-push', '/other/subpath');
});
});