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

[MM-40406] Add more singletons, refactor main.ts into pieces, add tests and some cleanup + tests for additional coverage (#1890)

Browse Source 
* Refactor main.ts dependencies into singleton pattern

* Split main.ts into testable pieces, some other refactoring for singleton pattern

* Unit tests for main/app/app

* Unit tests for main/app/config

* Unit tests for main/app/initialize

* Unit tests for main/app/intercom

* Unit tests for main/app/utils

* Add some more tests to get to 70% coverage

* Fix for linux

* Fix for alternate data dir paths

* Fix E2E test
This commit is contained in:
Devin Binnie
2021-12-09 15:11:55 -05:00
committed by GitHub
parent 850eadceb9
commit 39fbdf45c5
51 changed files with 2486 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/config/index.ts
View File

@@ -20,8 +20,9 @@ import {
TeamWithTabs,
} from 'types/config';
import {UPDATE_TEAMS, GET_CONFIGURATION, UPDATE_CONFIGURATION, GET_LOCAL_CONFIGURATION} from 'common/communication';
import {UPDATE_TEAMS, GET_CONFIGURATION, UPDATE_CONFIGURATION, GET_LOCAL_CONFIGURATION, UPDATE_PATHS} from 'common/communication';
import {configPath} from 'main/constants';
import * as Validator from 'main/Validator';
import {getDefaultTeamWithTabsFromTeam} from 'common/tabs/TabView';
import Utils from 'common/utils/util';
@@ -35,7 +36,7 @@ import RegistryConfig, {REGISTRY_READ_EVENT} from './RegistryConfig';
* Handles loading and merging all sources of configuration as well as saving user provided config
*/
export default class Config extends EventEmitter {
export class Config extends EventEmitter {
configFilePath: string;
registryConfig: RegistryConfig;
@@ -108,7 +109,6 @@ export default class Config extends EventEmitter {
this.regenerateCombinedConfigData();
this.emit('update', this.combinedData);
this.emit('synchronize');
}
/**
@@ -186,7 +186,6 @@ export default class Config extends EventEmitter {
}
}
this.emit('update', this.combinedData);
this.emit('synchronize');
});
} catch (error) {
this.emit('error', error);
@@ -266,6 +265,12 @@ export default class Config extends EventEmitter {
get helpLink() {
return this.combinedData?.helpLink;
}
get minimizeToTray() {
return this.combinedData?.minimizeToTray;
}
get lastActiveTeam() {
return this.combinedData?.lastActiveTeam;
}
// initialization/processing methods
@@ -540,3 +545,13 @@ export default class Config extends EventEmitter {
this.emit('darkModeChange', this.combinedData.darkMode);
}
}
const config = new Config(configPath);
export default config;
ipcMain.on(UPDATE_PATHS, () => {
config.configFilePath = configPath;
if (config.combinedData) {
config.reload();
}
});