@rvoh/psychic-spec-helpers 0.3.1-fgbeta-2 → 0.3.1-fgbeta-4

package/dist/esm/src/feature/helpers/visit.js

@@ -1,6 +1,4 @@
-import launchPage from './launchPage.js';
-export default async function visit(path, { page, baseUrl = 'http://localhost:3000' } = {}) {
-    page ||= await launchPage();
+export default async function visit(path, { baseUrl = 'http://localhost:3000' } = {}) {
     await page.goto(`${baseUrl}/${path.replace(/^\//, '')}`);
     return page;
 }

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

@@ -1,14 +1,21 @@
-import evaluateWithRetryAndTimeout from '../internal/evaluateWithRetryAndTimeout.js';
-import requirePuppeteerPage from '../internal/requirePuppeteerPage.js';
-export default async function toHaveSelector(page, expectedSelector) {
-    return await evaluateWithRetryAndTimeout(page, async () => {
-        requirePuppeteerPage(page);
+export default async function toHaveSelector(page, selector) {
+    try {
+        await page.waitForSelector(selector);
         return {
-            pass: !!(await page.$(expectedSelector)),
-            actual: expectedSelector,
+            pass: true,
+            message: () => `
+expected no selector: ${selector}
+but the selector was found
+      `,
         };
-    }, {
-        successText: r => `Expected ${r} to have selector: ${expectedSelector}`,
-        failureText: r => `Expected ${r} not to have selector: ${expectedSelector}`,
-    });
+    }
+    catch {
+        return {
+            pass: false,
+            message: () => `
+expected selector: ${selector}
+but no selector was found
+      `,
+        };
+    }
 }

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

@@ -1,16 +1,25 @@
-import evaluateWithRetryAndTimeout from '../internal/evaluateWithRetryAndTimeout.js';
-import getAllTextContentFromPage from '../internal/getAllTextContentFromPage.js';
-import requirePuppeteerPage from '../internal/requirePuppeteerPage.js';
-export default async function toMatchTextContent(argumentPassedToExpect, expected) {
-    return await evaluateWithRetryAndTimeout(argumentPassedToExpect, async () => {
-        requirePuppeteerPage(argumentPassedToExpect);
-        const actual = await getAllTextContentFromPage(argumentPassedToExpect);
+export default async function toMatchTextContent(page, text, { selector = 'body' } = {}) {
+    try {
+        await page.waitForSelector(`${selector}::-p-text(${text.replace(/"/g, '\\"')})`);
         return {
-            pass: actual.includes(expected),
-            actual,
+            pass: true,
+            message: () => `
+expected no ${selector} with text:
+        ${text}
+
+but text was found with that selector
+      `,
         };
-    }, {
-        successText: r => `Expected ${r} to match text ${expected}`,
-        failureText: r => `Expected ${r} not to match text ${expected}`,
-    });
+    }
+    catch {
+        return {
+            pass: false,
+            message: () => `
+expected ${selector} with text:
+        ${text}
+
+but no text was found within that selector
+      `,
+        };
+    }
 }

package/dist/types/src/feature/helpers/visit.d.ts

@@ -1,5 +1,3 @@
-import { Page } from 'puppeteer';
-export default function visit(path: string, { page, baseUrl }?: {
-    page?: Page;
+export default function visit(path: string, { baseUrl }?: {
     baseUrl?: string;
-}): Promise<Page>;
+}): Promise<import("puppeteer").Page>;

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

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

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

@@ -1,5 +1,7 @@
 import { Page } from 'puppeteer';
-export default function toMatchTextContent(argumentPassedToExpect: Page, expected: string): Promise<{
-    message: () => string;
+export default function toMatchTextContent(page: Page, text: string, { selector }?: {
+    selector?: string;
+}): Promise<{
     pass: boolean;
+    message: () => string;
 }>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@rvoh/psychic-spec-helpers",
-  "version": "0.3.1-fgbeta-2",
+  "version": "0.3.1-fgbeta-4",
   "description": "psychic framework spec helpers",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",

package/src/feature/helpers/visit.ts

@@ -1,11 +1,7 @@
-import { Page } from 'puppeteer'
-import launchPage from './launchPage.js'
-
 export default async function visit(
   path: string,
-  { page, baseUrl = 'http://localhost:3000' }: { page?: Page; baseUrl?: string } = {}
+  { baseUrl = 'http://localhost:3000' }: { baseUrl?: string } = {}
 ) {
-  page ||= await launchPage()
   await page.goto(`${baseUrl}/${path.replace(/^\//, '')}`)
   return page
 }

package/src/feature/matchers/toHaveSelector.ts

@@ -1,21 +1,22 @@
 import { Page } from 'puppeteer'
-import evaluateWithRetryAndTimeout from '../internal/evaluateWithRetryAndTimeout.js'
-import requirePuppeteerPage from '../internal/requirePuppeteerPage.js'
 
-export default async function toHaveSelector(page: Page, expectedSelector: string) {
-  return await evaluateWithRetryAndTimeout(
-    page,
-    async () => {
-      requirePuppeteerPage(page)
-
-      return {
-        pass: !!(await page.$(expectedSelector)),
-        actual: expectedSelector,
-      }
-    },
-    {
-      successText: r => `Expected ${r} to have selector: ${expectedSelector}`,
-      failureText: r => `Expected ${r} not to have selector: ${expectedSelector}`,
+export default async function toHaveSelector(page: Page, selector: string) {
+  try {
+    await page.waitForSelector(selector)
+    return {
+      pass: true,
+      message: () => `
+expected no selector: ${selector}
+but the selector was found
+      `,
+    }
+  } catch {
+    return {
+      pass: false,
+      message: () => `
+expected selector: ${selector}
+but no selector was found
+      `,
     }
-  )
+  }
 }

package/src/feature/matchers/toMatchTextContent.ts

@@ -1,23 +1,30 @@
 import { Page } from 'puppeteer'
-import evaluateWithRetryAndTimeout from '../internal/evaluateWithRetryAndTimeout.js'
-import getAllTextContentFromPage from '../internal/getAllTextContentFromPage.js'
-import requirePuppeteerPage from '../internal/requirePuppeteerPage.js'
 
-export default async function toMatchTextContent(argumentPassedToExpect: Page, expected: string) {
-  return await evaluateWithRetryAndTimeout(
-    argumentPassedToExpect,
-    async () => {
-      requirePuppeteerPage(argumentPassedToExpect)
+export default async function toMatchTextContent(
+  page: Page,
+  text: string,
+  { selector = 'body' }: { selector?: string } = {}
+) {
+  try {
+    await page.waitForSelector(`${selector}::-p-text(${text.replace(/"/g, '\\"')})`)
+    return {
+      pass: true,
+      message: () => `
+expected no ${selector} with text:
+        ${text}
 
-      const actual = await getAllTextContentFromPage(argumentPassedToExpect)
-      return {
-        pass: actual.includes(expected),
-        actual,
-      }
-    },
-    {
-      successText: r => `Expected ${r} to match text ${expected}`,
-      failureText: r => `Expected ${r} not to match text ${expected}`,
+but text was found with that selector
+      `,
     }
-  )
+  } catch {
+    return {
+      pass: false,
+      message: () => `
+expected ${selector} with text:
+        ${text}
+
+but no text was found within that selector
+      `,
+    }
+  }
 }