From 4ecf17db808172817e75b5f8cca75d18be2d0a90 Mon Sep 17 00:00:00 2001 From: Jamie Rolfs Date: Wed, 21 Sep 2022 18:50:00 -0700 Subject: [PATCH] fix(fixture): support function `TextMatch` argument in queries --- lib/fixture/helpers.ts | 6 ++++++ test/fixture/locators.test.ts | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/lib/fixture/helpers.ts b/lib/fixture/helpers.ts index cd4fef4..ec2571d 100644 --- a/lib/fixture/helpers.ts +++ b/lib/fixture/helpers.ts @@ -1,5 +1,6 @@ const replacer = (_: string, value: unknown) => { if (value instanceof RegExp) return `__REGEXP ${value.toString()}` + if (typeof value === 'function') return `__FUNCTION ${value.toString()}` return value } @@ -11,6 +12,11 @@ const reviver = (_: string, value: string) => { return new RegExp(match![1], match![2] || '') } + if (value.toString().includes('__FUNCTION ')) { + // eslint-disable-next-line @typescript-eslint/no-implied-eval + return new Function(`return (${value.split('__FUNCTION ')[1]}).apply(this, arguments)`) + } + return value } diff --git a/test/fixture/locators.test.ts b/test/fixture/locators.test.ts index 1076774..edb88bd 100644 --- a/test/fixture/locators.test.ts +++ b/test/fixture/locators.test.ts @@ -40,6 +40,28 @@ test.describe('lib/fixture.ts (locators)', () => { expect(await locator.textContent()).toEqual('Hello h1') }) + test('supports function style `TextMatch`', async ({screen}) => { + const locator = screen.getByText( + // eslint-disable-next-line prefer-arrow-callback, func-names + function (content, element) { + return content.startsWith('Hello') && element?.tagName.toLowerCase() === 'h3' + }, + ) + + expect(locator).toBeTruthy() + expect(await locator.textContent()).toEqual('Hello h3') + }) + + test('supports arrow function style `TextMatch`', async ({screen}) => { + const locator = screen.getByText( + (content, element) => + content.startsWith('Hello') && element?.tagName.toLowerCase() === 'h3', + ) + + expect(locator).toBeTruthy() + expect(await locator.textContent()).toEqual('Hello h3') + }) + test('should handle the get* methods', async ({queries: {getByTestId}}) => { const locator = getByTestId('testid-text-input')