@rvoh/psychic-spec-helpers 0.3.1-fgbeta-3 → 0.3.1-fgbeta-5

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

@@ -6,7 +6,7 @@ export default async function toClick(page, expectedText) {
     return await evaluateWithRetryAndTimeout(page, async () => {
         requirePuppeteerPage(page);
         try {
-            const el = await page.locator(`::-p-text(${expectedText})`).setTimeout(5000).wait();
+            const el = await page.locator(`*::-p-text(${expectedText})`).setTimeout(5000).wait();
             await el.click();
         }
         catch (err) {

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

@@ -1,3 +1,21 @@
-export default async function toHaveSelector(page, expectedSelector) {
-    await page.waitForSelector(expectedSelector);
+export default async function toHaveSelector(page, selector) {
+    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/dist/esm/src/feature/matchers/toMatchTextContent.js

@@ -1,3 +1,25 @@
 export default async function toMatchTextContent(page, text, { selector = 'body' } = {}) {
-    await page.waitForSelector(`${selector}::-p-text(${text.replace(/"/g, '\\"')})`);
+    try {
+        await page.waitForSelector(`${selector}::-p-text(${text.replace(/"/g, '\\"')})`);
+        return {
+            pass: true,
+            message: () => `
+expected no ${selector} with text:
+        ${text}
+
+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
+      `,
+        };
+    }
 }

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

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

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

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

package/dist/types/src/index.d.ts

@@ -32,7 +32,7 @@ interface PuppeteerAssertions {
     toCheck(expected: any): Promise<CustomMatcherResult>;
     toClick(expected: any): Promise<CustomMatcherResult>;
     toClickLink(expected: any): Promise<CustomMatcherResult>;
-    toClickLink(expected: any): Promise<CustomMatcherResult>;
+    toClickButton(expected: any): Promise<CustomMatcherResult>;
     toClickSelector(expected: any): Promise<CustomMatcherResult>;
     toHavePath(expected: any): Promise<CustomMatcherResult>;
     toHaveUrl(expected: any): Promise<CustomMatcherResult>;

package/package.json

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

package/src/feature/matchers/toClick.ts

@@ -10,7 +10,7 @@ export default async function toClick(page: Page, expectedText: string) {
       requirePuppeteerPage(page)
 
       try {
-        const el = await page.locator(`::-p-text(${expectedText})`).setTimeout(5000).wait()
+        const el = await page.locator(`*::-p-text(${expectedText})`).setTimeout(5000).wait()
         await el.click()
       } catch (err) {
         if (err instanceof TimeoutError) return evaluationFailure(expectedText)

package/src/feature/matchers/toHaveSelector.ts

@@ -1,5 +1,22 @@
 import { Page } from 'puppeteer'
 
-export default async function toHaveSelector(page: Page, expectedSelector: string) {
-  await page.waitForSelector(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

@@ -5,5 +5,26 @@ export default async function toMatchTextContent(
   text: string,
   { selector = 'body' }: { selector?: string } = {}
 ) {
-  await page.waitForSelector(`${selector}::-p-text(${text.replace(/"/g, '\\"')})`)
+  try {
+    await page.waitForSelector(`${selector}::-p-text(${text.replace(/"/g, '\\"')})`)
+    return {
+      pass: true,
+      message: () => `
+expected no ${selector} with text:
+        ${text}
+
+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
+      `,
+    }
+  }
 }

package/src/index.ts

@@ -40,7 +40,7 @@ interface PuppeteerAssertions {
   toCheck(expected: any): Promise<CustomMatcherResult>
   toClick(expected: any): Promise<CustomMatcherResult>
   toClickLink(expected: any): Promise<CustomMatcherResult>
-  toClickLink(expected: any): Promise<CustomMatcherResult>
+  toClickButton(expected: any): Promise<CustomMatcherResult>
   toClickSelector(expected: any): Promise<CustomMatcherResult>
   toHavePath(expected: any): Promise<CustomMatcherResult>
   toHaveUrl(expected: any): Promise<CustomMatcherResult>