test: work in progress

Author: christopherferreira9

tests/api-mocking/MockServerE2E.ts

@@ -6,6 +6,7 @@ import { createLogger, LogLevel } from '../framework/logger.ts';
 import {
   MockApiEndpoint,
   MockEventsObject,
+  PlatformDetector,
   Resource,
   ServerStatus,
   TestSpecificMock,
@@ -407,10 +408,9 @@ export default class MockServerE2E implements Resource {
             };
           }
 
-          let updatedUrl =
-            device.getPlatform() === 'android'
-              ? urlEndpoint.replace('localhost', '127.0.0.1')
-              : urlEndpoint;
+          let updatedUrl = (await PlatformDetector.isAndroid())
+            ? urlEndpoint.replace('localhost', '127.0.0.1')
+            : urlEndpoint;
 
           // Translate fallback ports to actual allocated ports (host-side forwarding)
           updatedUrl = translateFallbackPortToActual(updatedUrl);

tests/flows/general.flow.ts

@@ -57,8 +57,12 @@ export const dismissDevScreens = async (): Promise<void> => {
     await Gestures.tap(fastRefreshButton, {
       elemDescription: 'Dev Menu Fast Refresh Button',
     });
-  } catch {
-    logger.error('Dev screens dismiss error');
+  } catch (error) {
+    logger.debug(
+      `Dev screens were not dismissed (best effort): ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
   }
 };
 
@@ -105,8 +109,12 @@ export const dismissDevScreensPlaywright = async (): Promise<void> => {
       description: 'Dev Menu Fast Refresh Button should be visible',
     });
     await PlaywrightGestures.waitAndTap(fastRefreshButton);
-  } catch {
-    logger.error('Dev screens dismiss error');
+  } catch (error) {
+    logger.debug(
+      `Playwright dev screens were not dismissed (best effort): ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
   }
 };
 

tests/framework/PlaywrightUtilities.test.ts

@@ -0,0 +1,70 @@
+import PlaywrightUtilities from './PlaywrightUtilities';
+import type { CurrentDeviceDetails } from './fixture';
+
+describe('PlaywrightUtilities.launchApp', () => {
+  const executeMock = jest.fn();
+
+  const androidDevice: CurrentDeviceDetails = {
+    platform: 'android',
+    deviceName: 'Pixel_5',
+    udid: 'emulator-5554',
+    packageName: 'io.metamask',
+    launchableActivity: 'io.metamask.MainActivity',
+    isBrowserstack: false,
+  };
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    executeMock.mockResolvedValue(undefined);
+    globalThis.driver = {
+      execute: executeMock,
+    } as unknown as WebdriverIO.Browser;
+  });
+
+  afterEach(() => {
+    delete globalThis.driver;
+    jest.useRealTimers();
+    jest.clearAllMocks();
+  });
+
+  it('launches Android apps with Appium mobile startActivity intent parameters', async () => {
+    const launchPromise = PlaywrightUtilities.launchApp(androidDevice, {
+      launchArgs: {
+        fixtureServerPort: '1234',
+      },
+    });
+
+    await jest.advanceTimersByTimeAsync(1000);
+    await launchPromise;
+
+    expect(executeMock).toHaveBeenCalledWith(
+      'mobile: startActivity',
+      expect.objectContaining({
+        component: 'io.metamask/io.metamask.MainActivity',
+        action: 'android.intent.action.MAIN',
+        categories: ['android.intent.category.LAUNCHER'],
+        stop: true,
+        wait: true,
+        extras: expect.arrayContaining([['s', 'fixtureServerPort', '1234']]),
+      }),
+    );
+    expect(executeMock).not.toHaveBeenCalledWith(
+      'mobile: startActivity',
+      expect.objectContaining({
+        appPackage: expect.any(String),
+      }),
+    );
+    expect(executeMock).not.toHaveBeenCalledWith(
+      'mobile: startActivity',
+      expect.objectContaining({
+        appActivity: expect.any(String),
+      }),
+    );
+    expect(executeMock).not.toHaveBeenCalledWith(
+      'mobile: startActivity',
+      expect.objectContaining({
+        optionalIntentArguments: expect.any(String),
+      }),
+    );
+  });
+});

tests/framework/PlaywrightUtilities.ts

@@ -12,11 +12,13 @@ import Utilities from './Utilities';
 import { ACCOUNT_ACTIVITY_WS } from '../websocket/constants.ts';
 // eslint-disable-next-line import-x/no-nodejs-modules
 import { execSync } from 'child_process';
-import { CurrentDeviceDetails } from './fixture';
+import type { CurrentDeviceDetails } from './fixture';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import-x/no-commonjs, @typescript-eslint/no-require-imports
 const deviceMatrix: DeviceMatrix = require('../performance/device-matrix.json');
 
+type AndroidIntentExtra = ['s', string, string];
+
 /**
  * Get the driver instance.
  * @returns The driver instance.
@@ -270,29 +272,28 @@ class PlaywrightUtilities {
   }
 
   /**
-   * Builds `optionalIntentArguments` for Android `am start` from {@link LaunchArgs}.
-   * Each defined string value is passed as a string extra (`--es`) using the same keys
-   * as Detox `launchArgs` / `react-native-launch-arguments`.
+   * Builds Android string intent extras from {@link LaunchArgs}.
+   * Each defined string value is passed as a string extra (`--es`) using the
+   * same keys as Detox `launchArgs` / `react-native-launch-arguments`.
    */
-  private static buildAndroidOptionalIntentArguments(
+  private static buildAndroidIntentExtras(
     { launchArgs }: { launchArgs?: Partial<LaunchArgs> } = {
       launchArgs: {} as Partial<LaunchArgs>,
     },
-  ): string | undefined {
+  ): AndroidIntentExtra[] {
     const resolved = PlaywrightUtilities.buildResolvedLaunchArgs({
       launchArgs,
     });
 
-    const segments: string[] = [];
+    const extras: AndroidIntentExtra[] = [];
     for (const [key, value] of Object.entries(resolved)) {
       if (value === undefined || value === '') {
         continue;
       }
-      const escaped = String(value).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-      segments.push(`--es ${key} "${escaped}"`);
+      extras.push(['s', key, String(value)]);
     }
 
-    return segments.length > 0 ? segments.join(' ') : undefined;
+    return extras;
   }
 
   /**
@@ -340,16 +341,17 @@ class PlaywrightUtilities {
       );
     }
 
-    const optionalIntentArguments =
-      PlaywrightUtilities.buildAndroidOptionalIntentArguments({
-        launchArgs,
-      });
+    const extras = PlaywrightUtilities.buildAndroidIntentExtras({
+      launchArgs,
+    });
+
     await drv.execute('mobile: startActivity', {
-      appPackage: pkg,
-      appActivity: activity,
-      ...(optionalIntentArguments !== undefined
-        ? { optionalIntentArguments }
-        : {}),
+      component: `${pkg}/${activity}`,
+      action: 'android.intent.action.MAIN',
+      categories: ['android.intent.category.LAUNCHER'],
+      stop: true,
+      wait: true,
+      ...(extras.length > 0 ? { extras } : {}),
     });
   }
 
@@ -402,6 +404,7 @@ class PlaywrightUtilities {
     if (!currentDeviceDetails?.packageName && !currentDeviceDetails?.appId) {
       throw new Error('Package name or app id is not available');
     }
+
     if (currentDeviceDetails.platform === 'android') {
       await this.launchAppAndroid(currentDeviceDetails, {
         launchArgs,

tests/framework/fixtures/FixtureHelper.ts

@@ -67,6 +67,7 @@ import {
 } from '../../websocket/account-activity-mocks';
 import { FrameworkDetector } from '../FrameworkDetector';
 import PlaywrightUtilities from '../PlaywrightUtilities';
+import { DeviceCommandHandler } from '../services/device-commands';
 
 const logger = createLogger({
   name: 'FixtureHelper',
@@ -523,6 +524,10 @@ export async function withFixtures(
     analyticsExpectations,
     currentDeviceDetails,
   } = options;
+  const deviceCommands =
+    currentDeviceDetails && !currentDeviceDetails.isBrowserstack
+      ? new DeviceCommandHandler({ currentDeviceDetails, logger })
+      : undefined;
 
   // Clean up any stale port forwarding from previous failed tests
   // This ensures we start with a clean slate on Android
@@ -655,19 +660,36 @@ export async function withFixtures(
           throw new Error('currentDeviceDetails is not available');
         }
         const testArgs = {
-          fixtureServerPort: `${getFixturesServerPort()}`,
-          commandQueueServerPort: `${commandQueueServer.getServerPort()}`,
+          fixtureServerPort: isAndroid
+            ? `${FALLBACK_FIXTURE_SERVER_PORT}`
+            : `${getFixturesServerPort()}`,
+          commandQueueServerPort: isAndroid
+            ? `${FALLBACK_COMMAND_QUEUE_SERVER_PORT}`
+            : `${commandQueueServer.getServerPort()}`,
           detoxURLBlacklistRegex: Utilities.BlacklistURLs,
-          mockServerPort: `${mockServerPort}`,
-          [ACCOUNT_ACTIVITY_WS.launchArgKey]: `${accountActivityWsServer.getServerPort()}`,
+          mockServerPort: isAndroid
+            ? `${FALLBACK_MOCKSERVER_PORT}`
+            : `${mockServerPort}`,
+          [ACCOUNT_ACTIVITY_WS.launchArgKey]: isAndroid
+            ? `${ACCOUNT_ACTIVITY_WS.fallbackPort}`
+            : `${accountActivityWsServer.getServerPort()}`,
           ...(launchArgs || {}),
         };
-        console.log('currentDeviceDetails', currentDeviceDetails);
-        console.log('args', testArgs);
 
-        await PlaywrightUtilities.launchApp(currentDeviceDetails, {
-          launchArgs: testArgs,
-        });
+        if (deviceCommands) {
+          await deviceCommands.clearAppData();
+        }
+
+        const appStateRequest = fixtureServer.waitForNextStateRequest();
+        try {
+          await PlaywrightUtilities.launchApp(currentDeviceDetails, {
+            launchArgs: testArgs,
+          });
+          await appStateRequest;
+        } catch (error) {
+          appStateRequest.catch(() => undefined);
+          throw error;
+        }
       } else {
         throw new Error(`Unsupported test runner: ${framework}`);
       }
@@ -687,6 +709,7 @@ export async function withFixtures(
       mockServer: mockServerInstance.server,
       localNodes,
       commandQueueServer,
+      deviceCommands,
     });
   } catch (error) {
     testError = error as Error;