@rvoh/psychic-spec-helpers 0.4.2 → 0.4.4

package/dist/esm/src/feature/matchers/toClickButton.js

@@ -1,6 +1,6 @@
 export default async function toClickButton(page, expectedText, opts) {
     try {
-        const el = await page.waitForSelector('button::-p-text(Submit)', opts);
+        const el = await page.waitForSelector(`button::-p-text("${expectedText}")`, opts);
         await el.click();
         return {
             pass: true,

package/dist/esm/src/feature/matchers/toHavePath.js

@@ -1,17 +1,7 @@
-import evaluateWithRetryAndTimeout from '../internal/evaluateWithRetryAndTimeout.js';
 import requirePuppeteerPage from '../internal/requirePuppeteerPage.js';
 export default async function toHavePath(page, expectedPath) {
     requirePuppeteerPage(page);
-    return await evaluateWithRetryAndTimeout(page, async () => {
-        const pathname = new URL(page.url()).pathname;
-        return {
-            pass: pathname === expectedPath,
-            actual: expectedPath,
-        };
-    }, {
-        successText: () => {
-            throw new Error('cannot negate toHavePath');
-        },
-        failureText: () => `Expected page not to have path: "${expectedPath}"`,
-    });
+    await page.waitForFunction(
+    // @ts-expect-error window
+    path => new URL(window.location.href).pathname === expectedPath, {}, expectedPath);
 }

package/dist/types/src/feature/matchers/toHavePath.d.ts

@@ -1,5 +1,2 @@
 import { Page } from 'puppeteer';
-export default function toHavePath(page: Page, expectedPath: string): Promise<{
-    message: () => string;
-    pass: boolean;
-}>;
+export default function toHavePath(page: Page, expectedPath: string): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@rvoh/psychic-spec-helpers",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "psychic framework spec helpers",
   "author": "RVO Health",
   "repository": {
@@ -33,7 +33,6 @@
     "@types/supertest": "*",
     "puppeteer": "*",
     "supertest": "*",
-    "ts-node": "*",
     "typescript": "*"
   },
   "devDependencies": {

package/src/feature/matchers/toClickButton.ts

@@ -6,7 +6,7 @@ export default async function toClickButton(
   opts?: WaitForSelectorOptions
 ) {
   try {
-    const el = await page.waitForSelector('button::-p-text(Submit)', opts)
+    const el = await page.waitForSelector(`button::-p-text("${expectedText}")`, opts)
     await el!.click()
 
     return {

package/src/feature/matchers/toHavePath.ts

@@ -1,25 +1,13 @@
 import { Page } from 'puppeteer'
-import evaluateWithRetryAndTimeout from '../internal/evaluateWithRetryAndTimeout.js'
 import requirePuppeteerPage from '../internal/requirePuppeteerPage.js'
 
 export default async function toHavePath(page: Page, expectedPath: string) {
   requirePuppeteerPage(page)
 
-  return await evaluateWithRetryAndTimeout(
-    page,
-    async () => {
-      const pathname = new URL(page.url()).pathname
-
-      return {
-        pass: pathname === expectedPath,
-        actual: expectedPath,
-      }
-    },
-    {
-      successText: () => {
-        throw new Error('cannot negate toHavePath')
-      },
-      failureText: () => `Expected page not to have path: "${expectedPath}"`,
-    }
+  await page.waitForFunction(
+    // @ts-expect-error window
+    path => new URL(window.location.href).pathname === expectedPath,
+    {},
+    expectedPath
   )
 }