Address CodeRabbit review on server management E2E specs

Poll for Mattermost server view registration, wait for trusted cert
navigation before asserting ErrorView absence, and reuse launchDirectTestApp
in certificate_trust.test.ts.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: yasserfaraazkhan

e2e/specs/server_management/bad_servers.test.ts

@@ -301,9 +301,16 @@ test.describe('Bad Server Configurations', () => {
                 await dropdownView!.click('.ServerDropdown .ServerDropdown__button:nth-child(2)');
                 await closeOverlayWindowsIfOpen(app);
 
-                const serverMap = await buildServerMap(app);
-                const mmEntry = serverMap[demoMattermostConfig.servers[0].name][0];
-                const mmServer = mmEntry.win;
+                let mmEntry: Awaited<ReturnType<typeof buildServerMap>>[string][0] | undefined;
+                await expect.poll(async () => {
+                    const serverMap = await buildServerMap(app);
+                    mmEntry = serverMap[demoMattermostConfig.servers[0].name]?.[0];
+                    return Boolean(mmEntry);
+                }, {
+                    timeout: 45_000,
+                    message: 'Working Mattermost server view should be registered after switching servers',
+                }).toBe(true);
+                const mmServer = mmEntry!.win;
                 const cloudHost = new URL(process.env.MM_TEST_SERVER_URL!).host;
 
                 await expect.poll(
@@ -386,6 +393,19 @@ test.describe('Bad Server Configurations', () => {
                 const mainWindow = app.windows().find((w) => w.url().includes('index'));
                 expect(mainWindow).toBeDefined();
 
+                await expect.poll(async () => {
+                    const serverMap = await buildServerMap(app);
+                    const entry = serverMap['Pre-configured Expired Cert Trusted']?.[0];
+                    if (!entry) {
+                        return false;
+                    }
+                    const url = await entry.win.url().catch(() => '');
+                    return url.includes('expired.badssl.com');
+                }, {
+                    timeout: 45_000,
+                    message: 'Trusted expired-cert server view should finish loading before asserting ErrorView absence',
+                }).toBe(true);
+
                 const errorView = await mainWindow!.$('.ErrorView');
                 expect(errorView).toBeNull();
             } finally {

e2e/specs/server_management/certificate_trust.test.ts

@@ -5,10 +5,10 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 import {test, expect} from '../../fixtures/index';
-import {waitForAppReady} from '../../helpers/appReadiness';
-import {electronBinaryPath, appDir, demoConfig} from '../../helpers/config';
+import {demoConfig} from '../../helpers/config';
 import {clearCertificateErrorCallbacks, restoreMessageBox, stubMessageBoxResponses} from '../../helpers/dialog';
-import {registerElectronMainProcess, closeElectronAppFast} from '../../helpers/electronApp';
+import {closeElectronAppFast} from '../../helpers/electronApp';
+import {launchDirectTestApp} from '../../helpers/directLaunch';
 import {waitForErrorView} from '../../helpers/errorView';
 import {evaluateInMainProcess} from '../../helpers/testRefs';
 
@@ -34,22 +34,12 @@ test(
         fs.mkdirSync(userDataDir, {recursive: true});
         fs.writeFileSync(path.join(userDataDir, 'config.json'), JSON.stringify(badConfig));
 
-        const {_electron: electron} = await import('playwright');
-        const app = await electron.launch({
-            executablePath: electronBinaryPath,
-            args: [appDir, `--user-data-dir=${userDataDir}`, '--no-sandbox', '--disable-gpu'],
-            env: {
-                ...process.env,
-                NODE_ENV: 'test',
-                MM_E2E_STUB_MESSAGE_BOX: 'cancel',
-            },
-            timeout: 60_000,
+        const app = await launchDirectTestApp(userDataDir, badConfig, {
+            writeConfig: false,
+            extraEnv: {MM_E2E_STUB_MESSAGE_BOX: 'cancel'},
         });
 
-        registerElectronMainProcess(app.process()?.pid);
-
         try {
-            await waitForAppReady(app);
             await waitForErrorView(app);
 
             await clearCertificateErrorCallbacks(app);