@allwright.dev/vitest 0.0.44 → 0.0.46

package/README.md

@@ -1,6 +1,6 @@
 # @allwright.dev/vitest
 
-Vitest fixtures for allwright with Playwright-style `browser` and `page` injection.
+Vitest fixtures for allwright with Playwright-style `browser` and `page` injection, plus Android mobile fixtures for hybrid tests.
 
 Install:
 
@@ -16,6 +16,10 @@ test("opens a page", async ({ page }) => {
   const title = await page.textContent("h1");
   expect(title.text).toContain("Example");
 });
+
+test("opens an Android app", async ({ androidPage }) => {
+  await androidPage.click('Id=com.example.airticket:id/bottom_nav_account');
+});
 ```
 
 A checked-in example spec also lives in [examples/basic.spec.ts](./examples/basic.spec.ts).
@@ -29,9 +33,10 @@ schemaVersion: 1
 server:
   addr: 127.0.0.1:50051
 
-browser:
-  name: firefox
-  binary: /Applications/Firefox.app/Contents/MacOS/firefox
+web:
+  browser:
+    name: firefox
+    binary: /Applications/Firefox.app/Contents/MacOS/firefox
 
 expect:
   timeoutMs: 7000
@@ -39,8 +44,9 @@ expect:
 
 suites:
   smoke:
-    browser:
-      name: chromium
+    web:
+      browser:
+        name: chromium
 ```
 
 Vitest can override or select from that shared config without switching to a Vitest-specific file:
@@ -54,3 +60,38 @@ test.use({
   }
 });
 ```
+
+Android fixtures are available alongside the web fixtures:
+
+```ts
+import { test } from "@allwright.dev/vitest";
+
+test.use({
+  allwright: {
+    android: {
+      launchOptions: {
+        apkPath: "/absolute/path/to/app.apk",
+        appId: "com.example.airticket",
+      },
+    },
+  },
+});
+
+test("android only", async ({ androidPage }) => {
+  await androidPage.fill('xpath=//*[@text="Email"]', "user@example.com");
+});
+
+test("hybrid web and android", async ({ page, androidPage }) => {
+  await page.goto("https://example.com");
+  await androidPage.click('Id=com.example.airticket:id/bottom_nav_account');
+});
+```
+
+Available fixtures:
+
+- `browser`: launched web browser
+- `page`: initial web page
+- `android`: connected Android device session
+- `androidPage`: launched Android app page
+
+`androidPage` launches using `allwright.android.launchOptions` first, then falls back to `config.mobile.android`.

package/dist/index.d.ts

@@ -1,16 +1,22 @@
-import { type Browser, type BrowserKind, type LaunchOptions, type Locator, type Page, type WaitForSelectorOptions } from "@allwright.dev/core";
+import { type MobileAndroidConnectOptions, type MobileAndroidDevice, type MobileAndroidLaunchOptions, type MobileAndroidPage, type Browser, type BrowserKind, type LaunchOptions, type Locator, type Page, type WaitForSelectorOptions } from "@allwright.dev/core";
 import { expect as vitestExpect } from "vitest";
 export interface AllwrightVitestOptions {
     launchOptions?: LaunchOptions;
     serverAddr?: string;
     browser?: BrowserKind;
     browserBinary?: string;
+    android?: {
+        connectOptions?: MobileAndroidConnectOptions;
+        launchOptions?: MobileAndroidLaunchOptions;
+    };
     configFile?: string;
     suite?: string;
 }
 export interface AllwrightVitestFixtures {
     browser: Browser;
     page: Page;
+    android: MobileAndroidDevice;
+    androidPage: MobileAndroidPage;
 }
 export interface RetryExpectationOptions {
     timeoutMs?: number;
@@ -39,6 +45,8 @@ export interface LocatorExpectMatchers {
 export declare const test: import("vitest").TestAPI<{
     browser: Browser;
     page: Page;
+    android: MobileAndroidDevice;
+    androidPage: MobileAndroidPage;
     allwright: AllwrightVitestOptions;
 }>;
 type VitestExpect = typeof vitestExpect;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { launchConfiguredBrowser, resolveConfig, setServerAddr, shutdown, } from "@allwright.dev/core";
+import { launchConfiguredBrowser, mobile, resolveConfig, setServerAddr, shutdown, } from "@allwright.dev/core";
 import { expect as vitestExpect, test as base } from "vitest";
 export const test = base.extend({
     allwright: async ({}, use) => {
@@ -23,6 +23,17 @@ export const test = base.extend({
     page: async ({ browser }, use) => {
         await use(browser.page());
     },
+    android: async ({ allwright }, use) => {
+        const config = resolveVitestConfig(allwright);
+        const android = await mobile.android.connect(resolveAndroidConnectOptions(config, allwright));
+        await use(android);
+    },
+    androidPage: async ({ android, allwright }, use) => {
+        const config = resolveVitestConfig(allwright);
+        const launchOptions = resolveAndroidLaunchOptions(config, allwright);
+        const page = await android.launch(launchOptions);
+        await use(page);
+    },
 });
 const DEFAULT_EXPECT_TIMEOUT_MS = 5_000;
 const DEFAULT_EXPECT_INTERVAL_MS = 100;
@@ -56,6 +67,27 @@ function resolveVitestConfig(options) {
         expect: config.expect,
     };
 }
+function resolveAndroidConnectOptions(config, options) {
+    return {
+        device: options.android?.connectOptions?.device ?? config.mobile.android?.device,
+        adbEndpoint: options.android?.connectOptions?.adbEndpoint,
+        preserveAppState: options.android?.connectOptions?.preserveAppState ?? false,
+        timeoutMs: options.android?.connectOptions?.timeoutMs,
+    };
+}
+function resolveAndroidLaunchOptions(config, options) {
+    const launchOptions = {
+        apkPath: options.android?.launchOptions?.apkPath ?? config.mobile.android?.appBinary,
+        appId: options.android?.launchOptions?.appId ?? config.mobile.android?.appId,
+        launchActivity: options.android?.launchOptions?.launchActivity ?? config.mobile.android?.appActivity,
+        stopBeforeLaunch: options.android?.launchOptions?.stopBeforeLaunch ?? false,
+        timeoutMs: options.android?.launchOptions?.timeoutMs,
+    };
+    if (!launchOptions.apkPath && !launchOptions.appId) {
+        throw new Error("androidPage fixture requires android launch options with `apkPath` or `appId`, or config.mobile.android.app configured");
+    }
+    return launchOptions;
+}
 async function retryExpectation(callback, options = {}, defaults = {}) {
     const timeoutMs = options.timeoutMs ?? defaults.timeoutMs ?? DEFAULT_EXPECT_TIMEOUT_MS;
     const intervalMs = options.intervalMs ?? defaults.intervalMs ?? DEFAULT_EXPECT_INTERVAL_MS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allwright.dev/vitest",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Vitest fixtures for the allwright TypeScript client.",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@allwright.dev/core": "0.0.44"
+    "@allwright.dev/core": "0.0.46"
   },
   "devDependencies": {
     "typescript": "^5.9.2",