[MM-14093] Rename 'team' to 'server' and 'tab' to 'view' in most cases, some additional cleanup (#2711)
* Rename MattermostTeam -> UniqueServer, MattermostTab -> UniqueView * Rename 'team' to 'server' * Some further cleanup * Rename weirdly named function * Rename 'tab' to 'view' in most instances * Fix i18n * PR feedback
This commit is contained in:
@@ -40,7 +40,7 @@ if (process.platform === 'win32') {
|
||||
robot.mouseClick();
|
||||
}
|
||||
|
||||
const exampleTeam = {
|
||||
const exampleServer = {
|
||||
name: 'example',
|
||||
url: exampleURL,
|
||||
order: 0,
|
||||
@@ -61,7 +61,7 @@ const exampleTeam = {
|
||||
],
|
||||
lastActiveTab: 0,
|
||||
};
|
||||
const githubTeam = {
|
||||
const githubServer = {
|
||||
name: 'github',
|
||||
url: 'https://github.com/',
|
||||
order: 1,
|
||||
@@ -87,7 +87,7 @@ const githubTeam = {
|
||||
|
||||
const demoConfig = {
|
||||
version: 3,
|
||||
teams: [exampleTeam, githubTeam],
|
||||
teams: [exampleServer, githubServer],
|
||||
showTrayIcon: false,
|
||||
trayIconTheme: 'light',
|
||||
minimizeToTray: false,
|
||||
@@ -113,9 +113,9 @@ const demoConfig = {
|
||||
const demoMattermostConfig = {
|
||||
...demoConfig,
|
||||
teams: [{
|
||||
...exampleTeam,
|
||||
...exampleServer,
|
||||
url: mattermostURL,
|
||||
}, githubTeam],
|
||||
}, githubServer],
|
||||
};
|
||||
|
||||
const cmdOrCtrl = process.platform === 'darwin' ? 'command' : 'control';
|
||||
@@ -235,7 +235,7 @@ module.exports = {
|
||||
return null;
|
||||
}
|
||||
const info = await window.testHelper.getViewInfoForTest();
|
||||
return {viewName: `${info.serverName}___${info.tabType}`, webContentsId: info.webContentsId};
|
||||
return {viewName: `${info.serverName}___${info.viewType}`, webContentsId: info.webContentsId};
|
||||
}).then((result) => {
|
||||
if (result) {
|
||||
map[result.viewName] = {win, webContentsId: result.webContentsId};
|
||||
|
Reference in New Issue
Block a user