@allwright.dev/vitest 0.0.55 → 0.0.58

package/README.md

@@ -2,6 +2,19 @@
 
 Vitest fixtures for allwright with Playwright-style `browser` and `page` injection, plus Android mobile fixtures for hybrid tests.
 
+Wrap the Vitest configuration with `allwrightVitestConfig`. It starts Allwright once before workers run and shuts it down once after the complete test run. Existing user global setup files remain supported and run after Allwright starts, then tear down before Allwright stops.
+
+```ts
+import { allwrightVitestConfig } from "@allwright.dev/vitest/config";
+import { defineConfig } from "vitest/config";
+
+export default allwrightVitestConfig(defineConfig({
+  test: {
+    globalSetup: ["./test/my-global-setup.ts"],
+  },
+}));
+```
+
 Install:
 
 ```bash
@@ -54,11 +67,11 @@ suites:
 Vitest can override or select from that shared config without switching to a Vitest-specific file:
 
 ```ts
-import { test } from "@allwright.dev/vitest";
+import { expect, test as base } from "@allwright.dev/vitest";
 
-test.use({
-  allwright: {
-    suite: "smoke"
+const test = base.extend({
+  allwright: async ({}, use) => {
+    await use({ suite: "smoke" });
   }
 });
 ```
@@ -66,21 +79,24 @@ 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",
+import { expect, test as base } from "@allwright.dev/vitest";
+
+const test = base.extend({
+  allwright: async ({}, use) => {
+    await use({
+      android: {
+        launchOptions: {
+          apkPath: "/absolute/path/to/app.apk",
+          appId: "com.example.airticket",
+        },
       },
-    },
+    });
   },
 });
 
 test("android only", async ({ androidApp }) => {
   await androidApp.fill('xpath=//*[@text="Email"]', "user@example.com");
+  await expect(androidApp.locator('xpath=//*[@text="Email"]')).toHaveText("user@example.com");
 });
 
 test("hybrid web and android", async ({ page, androidApp }) => {
@@ -99,3 +115,5 @@ Available fixtures:
 - `androidApp`: launched Android app page
 
 `androidApp` launches using `allwright.android.launchOptions` first, then falls back to `config.mobile.android`.
+
+Android apps and locators support the Android-applicable action and expectation subset: `click`, `count`, `focus`, `fill`, `press`, `textContent`, `innerText`, `waitForSelector`, and `screenshot`. `expect(androidApp)` and `expect(androidApp.locator(...))` provide `toHaveText`, `toContainText`, `toHaveCount`, and `toBeVisible` with the same retry controls as web fixtures. Hover and highlight remain web-only.

package/dist/config.d.ts

@@ -0,0 +1,2 @@
+import type { UserConfig } from "vitest/config";
+export declare function allwrightVitestConfig<T extends UserConfig>(config: T): T;

package/dist/config.js

@@ -0,0 +1,20 @@
+import { fileURLToPath } from "node:url";
+const allwrightGlobalSetup = fileURLToPath(new URL("./global-setup.js", import.meta.url));
+export function allwrightVitestConfig(config) {
+    const configuredGlobalSetup = config.test?.globalSetup;
+    const globalSetup = [
+        allwrightGlobalSetup,
+        ...(Array.isArray(configuredGlobalSetup)
+            ? configuredGlobalSetup
+            : configuredGlobalSetup
+                ? [configuredGlobalSetup]
+                : []),
+    ];
+    return {
+        ...config,
+        test: {
+            ...config.test,
+            globalSetup,
+        },
+    };
+}

package/dist/global-setup.d.ts

@@ -0,0 +1,2 @@
+export declare function setup(): Promise<void>;
+export declare function teardown(): Promise<void>;

package/dist/global-setup.js

@@ -0,0 +1,11 @@
+import { ping, resolveConfig, setServerAddr, shutdown } from "@allwright.dev/core";
+export async function setup() {
+    const config = resolveConfig();
+    if (config.serverAddr) {
+        setServerAddr(config.serverAddr);
+    }
+    await ping();
+}
+export async function teardown() {
+    await shutdown();
+}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { type MobileAndroidConnectOptions, type MobileAndroidDevice, type MobileAndroidLaunchOptions, type MobileAndroidApp, type Browser, type BrowserKind, type LaunchOptions, type Locator, type Page, type WaitForSelectorOptions } from "@allwright.dev/core";
+import { type MobileAndroidConnectOptions, type MobileAndroidDevice, type MobileAndroidLaunchOptions, type MobileAndroidApp, type Browser, type BrowserKind, type LaunchOptions, type Locator, type MobileAndroidLocator, type Page, type WaitForSelectorOptions } from "@allwright.dev/core";
 import { expect as vitestExpect } from "vitest";
 export interface AllwrightVitestOptions {
     launchOptions?: LaunchOptions;
@@ -48,8 +48,8 @@ interface LazyResource<T> {
     realized(): boolean;
 }
 export declare const test: import("vitest").TestAPI<{
-    page: Page;
     browser: Browser;
+    page: Page;
     android: MobileAndroidDevice;
     androidApp: MobileAndroidApp;
     allwright: AllwrightVitestOptions;
@@ -61,6 +61,8 @@ type VitestMatcherReturn = ReturnType<VitestExpect>;
 interface AllwrightExpect extends VitestExpect {
     (actual: Page): PageExpectMatchers;
     (actual: Locator): LocatorExpectMatchers;
+    (actual: MobileAndroidApp): PageExpectMatchers;
+    (actual: MobileAndroidLocator): LocatorExpectMatchers;
     <T>(actual: T): VitestMatcherReturn;
 }
 export declare const expect: AllwrightExpect;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { launchConfiguredBrowser, mobile, resolveConfig, setServerAddr, shutdown, } from "@allwright.dev/core";
+import { launchConfiguredBrowser, mobile, resolveConfig, setServerAddr, } from "@allwright.dev/core";
 import { expect as vitestExpect, test as base } from "vitest";
 const DEFAULT_ANDROID_CONNECT_TIMEOUT_MS = 30_000;
 const DEFAULT_ANDROID_LAUNCH_TIMEOUT_MS = 60_000;
@@ -218,9 +218,27 @@ function createLazyAndroidApp(appResource) {
         async click(selector, options) {
             return (await appResource.get()).click(selector, options);
         },
+        async count(selector, options) {
+            return (await appResource.get()).count(selector, options);
+        },
+        async focus(selector, options) {
+            return (await appResource.get()).focus(selector, options);
+        },
         async fill(selector, value, options) {
             return (await appResource.get()).fill(selector, value, options);
         },
+        async press(selector, key, options) {
+            return (await appResource.get()).press(selector, key, options);
+        },
+        async textContent(selector, options) {
+            return (await appResource.get()).textContent(selector, options);
+        },
+        async innerText(selector, options) {
+            return (await appResource.get()).innerText(selector, options);
+        },
+        async waitForSelector(selector, options) {
+            return (await appResource.get()).waitForSelector(selector, options);
+        },
         async screenshot(options) {
             return (await appResource.get()).screenshot(options);
         },
@@ -238,9 +256,27 @@ function createLazyAndroidLocator(appResource, selectorFactory) {
         async click(options) {
             return (await appResource.get()).locator(await selectorFactory()).click(options);
         },
+        async count(options) {
+            return (await appResource.get()).locator(await selectorFactory()).count(options);
+        },
+        async focus(options) {
+            return (await appResource.get()).locator(await selectorFactory()).focus(options);
+        },
         async fill(value, options) {
             return (await appResource.get()).locator(await selectorFactory()).fill(value, options);
         },
+        async press(key, options) {
+            return (await appResource.get()).locator(await selectorFactory()).press(key, options);
+        },
+        async textContent(options) {
+            return (await appResource.get()).locator(await selectorFactory()).textContent(options);
+        },
+        async innerText(options) {
+            return (await appResource.get()).locator(await selectorFactory()).innerText(options);
+        },
+        async waitFor(options) {
+            return (await appResource.get()).locator(await selectorFactory()).waitFor(options);
+        },
         locator(selector) {
             return createLazyAndroidLocator(appResource, async () => (await appResource.get()).locator(await selectorFactory()).locator(selector).selector);
         },
@@ -282,9 +318,8 @@ export const test = base.extend({
         finally {
             activeExpectDefaults = {};
             if (browserResource.realized()) {
-                await browserResource.get().then((resolved) => resolved.close()).catch(() => undefined);
+                await browserResource.get().then((resolved) => resolved.close());
             }
-            await shutdown();
         }
     },
     _androidResource: async ({ allwright }, use) => {
@@ -293,12 +328,7 @@ export const test = base.extend({
             setServerAddr(config.serverAddr);
         }
         const androidResource = createLazyResource(async () => mobile.android.connect(resolveAndroidConnectOptions(config, allwright)));
-        try {
-            await use(androidResource);
-        }
-        finally {
-            await shutdown();
-        }
+        await use(androidResource);
     },
     browser: async ({ _browserResource }, use) => {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allwright.dev/vitest",
-  "version": "0.0.55",
+  "version": "0.0.58",
   "description": "Vitest fixtures for the allwright TypeScript client.",
   "license": "MIT",
   "type": "module",
@@ -25,6 +25,14 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
+    },
+    "./config": {
+      "types": "./dist/config.d.ts",
+      "import": "./dist/config.js"
+    },
+    "./global-setup": {
+      "types": "./dist/global-setup.d.ts",
+      "import": "./dist/global-setup.js"
     }
   },
   "files": [
@@ -39,7 +47,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@allwright.dev/core": "0.0.55"
+    "@allwright.dev/core": "0.0.58"
   },
   "devDependencies": {
     "typescript": "^5.9.2",