[MM-50485] Migrate app to ServerManager, remove view names and replace with IDs (#2672)

* Migrate app to ServerManager, remove view names and replace with IDs

* Fixed a test

* Fixed a bug when adding the initial server

* Merge'd

* Bug fixes and PR feedback
This commit is contained in:
Devin Binnie
2023-04-12 12:52:34 -04:00
committed by GitHub
parent d87097b1eb
commit 686b4ac9f1
58 changed files with 1570 additions and 2175 deletions

View File

@@ -234,9 +234,8 @@ module.exports = {
if (!window.testHelper) {
return null;
}
const name = await window.testHelper.getViewName();
const webContentsId = await window.testHelper.getWebContentsId();
return {viewName: name, webContentsId};
const info = await window.testHelper.getViewInfoForTest();
return {viewName: `${info.serverName}___${info.tabType}`, webContentsId: info.webContentsId};
}).then((result) => {
if (result) {
map[result.viewName] = {win, webContentsId: result.webContentsId};

View File

@@ -137,7 +137,7 @@ describe('Add Server Modal', function desc() {
const savedConfig = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
savedConfig.teams.should.deep.contain({
name: 'TestTeam',
url: 'http://example.org',
url: 'http://example.org/',
order: 2,
tabs: [
{

View File

@@ -83,9 +83,8 @@ describe('Configure Server Modal', function desc() {
const savedConfig = JSON.parse(fs.readFileSync(env.configFilePath, 'utf8'));
savedConfig.teams.should.deep.contain({
url: 'http://example.org',
url: 'http://example.org/',
name: 'TestTeam',
index: null,
order: 0,
tabs: [
{

View File

@@ -201,7 +201,7 @@ describe('EditServerModal', function desc() {
});
savedConfig.teams.should.deep.contain({
name: 'example',
url: 'http://google.com',
url: 'http://google.com/',
order: 0,
tabs: [
{
@@ -254,7 +254,7 @@ describe('EditServerModal', function desc() {
});
savedConfig.teams.should.deep.contain({
name: 'NewTestTeam',
url: 'http://google.com',
url: 'http://google.com/',
order: 0,
tabs: [
{