test(e2e): Server lifecycle, startup, tray/settings, and deep linking

e2e/helpers/errorView.ts

@@ -0,0 +1,140 @@
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {expect} from '@playwright/test';
+import type {ElectronApplication} from 'playwright';
+
+import {clearCertificateErrorCallbacks} from './dialog';
+import {evaluateInMainProcessWithArg} from './testRefs';
+
+type WaitForErrorViewOptions = {
+    serverName?: string;
+    timeout?: number;
+};
+
+/**
+ * Wait for the renderer to mount, then reload server views so load failures
+ * that fired before IPC listeners were registered are surfaced in ErrorView.
+ */
+export async function waitForRendererThenReload(
+    app: ElectronApplication,
+    serverName?: string,
+): Promise<void> {
+    const mainWindow = app.windows().find((window) => window.url().includes('index'));
+    if (!mainWindow) {
+        return;
+    }
+
+    await mainWindow.waitForSelector('.ServerDropdownButton', {timeout: 15_000}).catch(() => {});
+
+    if (serverName) {
+        await expect.poll(() => {
+            return !app.windows().some((window) => {
+                try {
+                    return window.url().includes('newServer');
+                } catch {
+                    return false;
+                }
+            });
+        }, {timeout: 10_000, message: 'Add server modal should close after confirm'}).toBe(true);
+
+        await expect.poll(async () => {
+            return mainWindow.innerText('.ServerDropdownButton');
+        }, {timeout: 10_000, message: `Active server should switch to ${serverName}`}).toContain(serverName);
+    }
+
+    // Wait until ServerManager knows about the target server. We intentionally do NOT
+    // require a WebContentsManager entry to exist here: on platforms where the initial
+    // load fails very fast (e.g. expired cert at startup), the view may never be added
+    // to WebContentsManager before this poll's deadline. If no view exists, the reload
+    // step below becomes a no-op and the existing load failure already surfaces in
+    // `.ErrorView`, which is what the caller is polling for.
+    //
+    // NOTE: Playwright's ElectronApplication.evaluate(fn, arg) always passes the
+    // `electron` module as the FIRST argument to `fn`. The user-supplied `arg` is the
+    // SECOND argument. Hence the `(_electron, targetServerName)` signature below.
+    await expect.poll(() => {
+        return evaluateInMainProcessWithArg(app, (_electron, targetServerName) => {
+            const refs = (global as any).__e2eTestRefs;
+            if (!refs) {
+                return false;
+            }
+            const servers: Array<{id: string; name: string}> = refs.ServerManager?.getAllServers?.() ?? [];
+            const serversToCheck = targetServerName ?
+                servers.filter((server) => server.name === targetServerName) :
+                servers;
+            return serversToCheck.length > 0;
+        }, serverName);
+    }, {timeout: 15_000, message: 'Target server should be registered before reload'}).toBe(true);
+
+    await clearCertificateErrorCallbacks(app).catch(() => {});
+
+    await evaluateInMainProcessWithArg(app, (_electron, targetServerName) => {
+        const refs = (global as any).__e2eTestRefs;
+        if (!refs) {
+            return;
+        }
+        const servers: Array<{id: string; name: string}> = refs.ServerManager?.getAllServers?.() ?? [];
+        const serversToReload = targetServerName ?
+            servers.filter((server) => server.name === targetServerName) :
+            servers;
+        for (const server of serversToReload) {
+            const views: Array<{id: string}> = refs.ViewManager?.getViewsByServerId?.(server.id) ?? [];
+            for (const view of views) {
+                const wcEntry = refs.WebContentsManager?.getView?.(view.id);
+                wcEntry?.reload?.();
+            }
+        }
+    }, serverName);
+
+    await expect.poll(async () => {
+        return evaluateInMainProcessWithArg(app, (_electron, targetServerName) => {
+            const refs = (global as any).__e2eTestRefs;
+            if (!refs) {
+                return false;
+            }
+            const servers: Array<{id: string; name: string}> = refs.ServerManager?.getAllServers?.() ?? [];
+            const serversToCheck = targetServerName ?
+                servers.filter((server) => server.name === targetServerName) :
+                servers;
+            for (const server of serversToCheck) {
+                const views: Array<{id: string}> = refs.ViewManager?.getViewsByServerId?.(server.id) ?? [];
+                for (const view of views) {
+                    const wcEntry = refs.WebContentsManager?.getView?.(view.id);
+                    if (wcEntry?.webContents?.isLoading?.()) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }, serverName);
+    }, {timeout: 15_000, message: 'Server views should finish reloading after renderer is ready'}).toBe(true);
+}
+
+export async function waitForErrorView(
+    app: ElectronApplication,
+    options: WaitForErrorViewOptions = {},
+): Promise<void> {
+    const timeout = options.timeout ?? (process.env.CI ? 60_000 : 45_000);
+    const deadline = Date.now() + timeout;
+    let lastError: unknown;
+    while (Date.now() < deadline) {
+        try {
+            const mainWindow = app.windows().find((window) => window.url().includes('index'));
+            if (!mainWindow) {
+                throw new Error('Main index window is not available yet');
+            }
+            await waitForRendererThenReload(app, options.serverName);
+            await mainWindow.waitForSelector('.ErrorView', {
+                timeout: Math.min(10_000, deadline - Date.now()),
+            });
+            return;
+        } catch (error) {
+            lastError = error;
+            await clearCertificateErrorCallbacks(app).catch(() => {});
+            await new Promise((resolve) => setTimeout(resolve, 250));
+        }
+    }
+
+    throw lastError instanceof Error ? lastError : new Error('ErrorView did not appear before timeout');
+}

e2e/specs/server_management/add_server_modal.test.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import {test, expect} from '../../fixtures/index';
 import {waitForAppReady} from '../../helpers/appReadiness';
 import {electronBinaryPath, appDir, demoConfig, writeConfigFile} from '../../helpers/config';
-import {waitForLockFileRelease} from '../../helpers/cleanup';
+import {closeElectronAppFast} from '../../helpers/electronApp';
 
 async function waitForWindow(app: Awaited<ReturnType<typeof import('playwright')['_electron']['launch']>>, pattern: string, timeout = 30_000) {
     const timeoutAt = Date.now() + timeout;
@@ -66,8 +66,7 @@ test.describe('Add Server Modal', () => {
             const isFocused = await newServerView.$eval('#serverUrlInput', (el) => el.isSameNode(document.activeElement));
             expect(isFocused).toBe(true);
         } finally {
-            await app.close();
-            await waitForLockFileRelease(userDataDir);
+            await closeElectronAppFast(app, userDataDir);
         }
     });
 
@@ -79,8 +78,7 @@ test.describe('Add Server Modal', () => {
             const existing = Boolean(app.windows().find((w) => w.url().includes('newServer')));
             expect(existing).toBe(false);
         } finally {
-            await app.close();
-            await waitForLockFileRelease(userDataDir);
+            await closeElectronAppFast(app, userDataDir);
         }
     });
 
@@ -91,8 +89,7 @@ test.describe('Add Server Modal', () => {
                 const disabled = await newServerView.getAttribute('#newServerModal_confirm', 'disabled');
                 expect(disabled === '').toBe(true);
             } finally {
-                await app.close();
-                await waitForLockFileRelease(userDataDir);
+                await closeElectronAppFast(app, userDataDir);
             }
         });
 
@@ -107,8 +104,7 @@ test.describe('Add Server Modal', () => {
                 const disabled = await newServerView.getAttribute('#newServerModal_confirm', 'disabled');
                 expect(disabled === '').toBe(false);
             } finally {
-                await app.close();
-                await waitForLockFileRelease(userDataDir);
+                await closeElectronAppFast(app, userDataDir);
             }
         });
 
@@ -121,8 +117,7 @@ test.describe('Add Server Modal', () => {
                     const disabled = await newServerView.getAttribute('#newServerModal_confirm', 'disabled');
                     expect(disabled === '').toBe(true);
                 } finally {
-                    await app.close();
-                    await waitForLockFileRelease(userDataDir);
+                    await closeElectronAppFast(app, userDataDir);
                 }
             });
         });
@@ -140,8 +135,7 @@ test.describe('Add Server Modal', () => {
                     expect(existingUrl).toBe(false);
                     expect(disabled === '').toBe(true);
                 } finally {
-                    await app.close();
-                    await waitForLockFileRelease(userDataDir);
+                    await closeElectronAppFast(app, userDataDir);
                 }
             });
         });
@@ -155,8 +149,7 @@ test.describe('Add Server Modal', () => {
             const existing = await newServerView.isVisible('#customMessage_url.Input___error');
             expect(existing).toBe(true);
         } finally {
-            await app.close();
-            await waitForLockFileRelease(userDataDir);
+            await closeElectronAppFast(app, userDataDir);
         }
     });
 
@@ -170,8 +163,7 @@ test.describe('Add Server Modal', () => {
                 const disabled = await newServerView.getAttribute('#newServerModal_confirm', 'disabled');
                 expect(disabled === null).toBe(true);
             } finally {
-                await app.close();
-                await waitForLockFileRelease(userDataDir);
+                await closeElectronAppFast(app, userDataDir);
             }
         });
 
@@ -202,8 +194,7 @@ test.describe('Add Server Modal', () => {
                     }),
                 ]));
             } finally {
-                await app.close();
-                await waitForLockFileRelease(userDataDir);
+                await closeElectronAppFast(app, userDataDir);
             }
         });
     });