Fix cross-platform E2E spec behavior

Author: CodeGhost21

app/test/e2e/helpers/element-helpers.ts

@@ -26,13 +26,11 @@ import { isTauriDriver } from './platform';
 // ---------------------------------------------------------------------------
 
 function xpathStringLiteral(text: string): string {
-  const escaped = text.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
-
-  if (!escaped.includes('"')) return `"${escaped}"`;
-  if (!escaped.includes("'")) return `'${escaped}'`;
+  if (!text.includes('"')) return `"${text}"`;
+  if (!text.includes("'")) return `'${text}'`;
   const parts: string[] = [];
   let current = '';
-  for (const ch of escaped) {
+  for (const ch of text) {
     if (ch === '"') {
       if (current) parts.push(`"${current}"`);
       parts.push("'\"'");

app/test/e2e/specs/auth-access-control.spec.ts

@@ -339,7 +339,7 @@ describe('Auth & Access Control', () => {
   // 5. Logout
   // -------------------------------------------------------------------------
 
-  it('user can log out via Settings and returns to Welcome', async () => {
+  it('user can log out via Settings and returns to Welcome', async function () {
     if (isMac2()) {
       await navigateToSettings();
       const hasLogoutEntry =
@@ -350,7 +350,7 @@ describe('Auth & Access Control', () => {
       console.log(
         '[AuthAccess] Logout settings entry verified on Mac2; click-through logout remains unreliable via WKWebView accessibility'
       );
-      return;
+      this.skip();
     }
 
     // Re-auth to get a clean session for logout

app/test/e2e/specs/card-payment-flow.spec.ts

@@ -169,12 +169,12 @@ describe('Card Payment Flow', () => {
     await navigateToHome();
   });
 
-  it('5.3.2 — Manage Subscription opens Stripe portal', async () => {
+  it('5.3.2 — Manage Subscription opens Stripe portal', async function () {
     if (isMac2()) {
       console.log(
         `${LOG_PREFIX} 5.3.2 — skipping portal action assertion on Mac2; billing header actions are not exposed reliably in WKWebView accessibility`
       );
-      return;
+      this.skip();
     }
 
     // Seed mock with active subscription so "Manage" button appears

app/test/e2e/specs/conversations-web-channel-flow.spec.ts

@@ -56,12 +56,12 @@ suiteRunner('Conversations web channel flow', () => {
     await stopMockServer();
   });
 
-  it('sends UI message through agent loop and renders response', async () => {
+  it('sends UI message through agent loop and renders response', async function () {
     if (isMac2()) {
       console.log(
         '[ConversationsE2E] Skipping on Mac2: composing and submitting chat input requires WebView execute, which Appium WKWebView does not support'
       );
-      return;
+      this.skip();
     }
 
     stepLog('trigger deep link');

app/test/e2e/specs/crypto-payment-flow.spec.ts

@@ -64,29 +64,12 @@ describe('Crypto Payment Flow', () => {
     await performFullLogin('e2e-crypto-payment-token');
   });
 
-  it('6.1.1 — upgrade with crypto toggle triggers Coinbase charge', async () => {
+  it('6.1.1 — upgrade with crypto toggle triggers Coinbase charge', async function () {
     if (isMac2()) {
-      resetMockBehavior();
-      await navigateToBilling();
-      clearRequestLog();
-
-      const hasCryptoLabel = await textExists('Pay with Crypto');
-      expect(hasCryptoLabel).toBe(true);
-
-      try {
-        await clickToggle(10_000);
-      } catch {
-        await clickText('Pay with Crypto', 10_000);
-      }
-      await browser.pause(2_000);
-
-      const annualStillVisible = await textExists('Annual');
-      expect(annualStillVisible).toBe(true);
       console.log(
-        `${LOG_PREFIX} 6.1.1 — Mac2 verified crypto toggle interaction; request-level Coinbase assertion skipped due to unreliable WKWebView control clicks`
+        `${LOG_PREFIX} 6.1.1 — skipping Coinbase charge assertion on Mac2; WKWebView control clicks are not reliable enough to validate this flow`
       );
-      await navigateToHome();
-      return;
+      this.skip();
     }
 
     resetMockBehavior();

app/test/e2e/specs/login-flow.spec.ts

@@ -437,12 +437,15 @@ describe('Login flow — complete with mock data (Linux)', () => {
     resetMockBehavior();
 
     if (isTauriDriver()) {
-      // tauri-driver (Linux/Windows): clear localStorage directly via JS
+      // tauri-driver (Linux/Windows): clear persisted web storage and reload so
+      // the in-memory auth state is rebuilt from an unauthenticated baseline.
       await browser.execute(() => {
         localStorage.removeItem('persist:auth');
-        window.location.hash = '/';
+        sessionStorage.clear();
+        window.location.reload();
       });
-      await browser.pause(2_000);
+      await waitForAppReady(20_000);
+      console.log('[LoginFlow] Bypass auth: cleared web storage and reloaded app (Linux/Windows)');
     } else {
       // Appium Mac2 (macOS): browser.execute() is not supported for DOM access.
       // Terminate the app, wipe WebKit storage, and relaunch for a clean slate.