diff --git a/packages/lit-query/src/tests/client-switch-controllers.test.ts b/packages/lit-query/src/tests/client-switch-controllers.test.ts index d15595b2fe..3ca3ee1c52 100644 --- a/packages/lit-query/src/tests/client-switch-controllers.test.ts +++ b/packages/lit-query/src/tests/client-switch-controllers.test.ts @@ -126,7 +126,7 @@ describe('client switching across controllers', () => { await Promise.resolve() await vi.advanceTimersByTimeAsync(10) expect(consumer.queries()[0]).toBe('q-1') - expect(consumer.shadowRoot?.textContent).toContain('data: q-1') + expect(consumer.shadowRoot).toHaveTextContent('data: q-1') const cacheAEntryBeforeSwitch = clientA .getQueryCache() @@ -142,7 +142,7 @@ describe('client switching across controllers', () => { .find({ queryKey: consumer.queryKey }) ?.getObserversCount(), ).toBe(1) - expect(consumer.shadowRoot?.textContent).toContain('data: q-2') + expect(consumer.shadowRoot).toHaveTextContent('data: q-2') const cacheAEntryAfterSwitch = clientA .getQueryCache() @@ -153,7 +153,7 @@ describe('client switching across controllers', () => { expect(consumer.queryCalls).toBe(3) await vi.advanceTimersByTimeAsync(10) expect(consumer.queries()[0]).toBe('q-3') - expect(consumer.shadowRoot?.textContent).toContain('data: q-3') + expect(consumer.shadowRoot).toHaveTextContent('data: q-3') consumer.queries.destroy() provider.remove() diff --git a/packages/lit-query/src/tests/counters-and-state.test.ts b/packages/lit-query/src/tests/counters-and-state.test.ts index 2239984515..ec8edc21cc 100644 --- a/packages/lit-query/src/tests/counters-and-state.test.ts +++ b/packages/lit-query/src/tests/counters-and-state.test.ts @@ -354,22 +354,22 @@ describe('useIsFetching/useIsMutating/useMutationState', () => { await vi.advanceTimersByTimeAsync(0) expect(isFetching()).toBe(1) - expect(host.shadowRoot?.textContent).toContain('fetching: 1') + expect(host.shadowRoot).toHaveTextContent('fetching: 1') await vi.advanceTimersByTimeAsync(10) expect(query().isSuccess).toBe(true) expect(isFetching()).toBe(0) - expect(host.shadowRoot?.textContent).toContain('fetching: 0') + expect(host.shadowRoot).toHaveTextContent('fetching: 0') mutation.mutate(1) expect(isMutating()).toBe(1) await vi.advanceTimersByTimeAsync(0) - expect(host.shadowRoot?.textContent).toContain('mutating: 1') - expect(host.shadowRoot?.textContent).toContain('statuses: pending') + expect(host.shadowRoot).toHaveTextContent('mutating: 1') + expect(host.shadowRoot).toHaveTextContent('statuses: pending') await vi.advanceTimersByTimeAsync(10) expect(isMutating()).toBe(0) expect(mutationStatuses()).toContain('success') - expect(host.shadowRoot?.textContent).toContain('mutating: 0') - expect(host.shadowRoot?.textContent).toContain('statuses: success') + expect(host.shadowRoot).toHaveTextContent('mutating: 0') + expect(host.shadowRoot).toHaveTextContent('statuses: success') }) it('should track filters and filter reactivity in useIsFetching', async () => { diff --git a/packages/lit-query/src/tests/infinite-and-options.test.ts b/packages/lit-query/src/tests/infinite-and-options.test.ts index a92871d5f1..6ffc2bd580 100644 --- a/packages/lit-query/src/tests/infinite-and-options.test.ts +++ b/packages/lit-query/src/tests/infinite-and-options.test.ts @@ -159,23 +159,23 @@ describe('createInfiniteQueryController', () => { const infinite = host.infinite await host.updateComplete - expect(host.shadowRoot?.textContent).toContain('pages: none') + expect(host.shadowRoot).toHaveTextContent('pages: none') await vi.advanceTimersByTimeAsync(10) expect(infinite().isSuccess).toBe(true) expect(infinite().data?.pages).toEqual([0]) - expect(host.shadowRoot?.textContent).toContain('pages: 0') + expect(host.shadowRoot).toHaveTextContent('pages: 0') const fetchNextPagePromise = infinite.fetchNextPage() await vi.advanceTimersByTimeAsync(10) await fetchNextPagePromise expect(infinite().data?.pages).toEqual([0, 1]) - expect(host.shadowRoot?.textContent).toContain('pages: 0, 1') + expect(host.shadowRoot).toHaveTextContent('pages: 0, 1') const fetchPreviousPagePromise = infinite.fetchPreviousPage() await vi.advanceTimersByTimeAsync(10) await fetchPreviousPagePromise expect(infinite().data?.pages).toEqual([-1, 0, 1]) - expect(host.shadowRoot?.textContent).toContain('pages: -1, 0, 1') + expect(host.shadowRoot).toHaveTextContent('pages: -1, 0, 1') }) it('should not request another update when stable function options refresh during host update', async () => { diff --git a/packages/lit-query/src/tests/mutation-controller.test.ts b/packages/lit-query/src/tests/mutation-controller.test.ts index 3549d6528c..e1a9ff58b5 100644 --- a/packages/lit-query/src/tests/mutation-controller.test.ts +++ b/packages/lit-query/src/tests/mutation-controller.test.ts @@ -138,20 +138,20 @@ describe('createMutationController', () => { const mutation = host.mutation await host.updateComplete - expect(host.shadowRoot?.textContent).toContain('data: none') + expect(host.shadowRoot).toHaveTextContent('data: none') const resultPromise = mutation.mutateAsync(1) await vi.advanceTimersByTimeAsync(10) await expect(resultPromise).resolves.toBe(2) expect(mutation().isSuccess).toBe(true) expect(mutation().data).toBe(2) - expect(host.shadowRoot?.textContent).toContain('data: 2') + expect(host.shadowRoot).toHaveTextContent('data: 2') mutation.mutate(2) await vi.advanceTimersByTimeAsync(10) expect(mutation().data).toBe(3) expect(mutation().isSuccess).toBe(true) - expect(host.shadowRoot?.textContent).toContain('data: 3') + expect(host.shadowRoot).toHaveTextContent('data: 3') }) it('should cover idle/pending/success/error mutation state transitions', async () => { diff --git a/packages/lit-query/src/tests/queries-controller.test.ts b/packages/lit-query/src/tests/queries-controller.test.ts index 430fcefa56..d38f4670cd 100644 --- a/packages/lit-query/src/tests/queries-controller.test.ts +++ b/packages/lit-query/src/tests/queries-controller.test.ts @@ -172,10 +172,10 @@ describe('createQueriesController', () => { const queries = host.queries await host.updateComplete - expect(host.shadowRoot?.textContent).toContain('data: none, none') + expect(host.shadowRoot).toHaveTextContent('data: none, none') await vi.advanceTimersByTimeAsync(10) expect(queries()).toEqual(['alpha', 'beta']) - expect(host.shadowRoot?.textContent).toContain('data: alpha, beta') + expect(host.shadowRoot).toHaveTextContent('data: alpha, beta') }) it('should not request another update when stable function query options refresh during host update', async () => { diff --git a/packages/lit-query/src/tests/query-controller.test.ts b/packages/lit-query/src/tests/query-controller.test.ts index 268c6fe430..66db73d7d4 100644 --- a/packages/lit-query/src/tests/query-controller.test.ts +++ b/packages/lit-query/src/tests/query-controller.test.ts @@ -120,13 +120,13 @@ describe('createQueryController', () => { container.append(host) await host.updateComplete - expect(host.shadowRoot?.textContent).toContain('name: none') + expect(host.shadowRoot).toHaveTextContent('name: none') await vi.advanceTimersByTimeAsync(10) expect(query().isSuccess).toBe(true) expect(query().data).toEqual({ id: 1, name: 'Ada' }) expect(callCount).toBe(1) - expect(host.shadowRoot?.textContent).toContain('name: Ada') + expect(host.shadowRoot).toHaveTextContent('name: Ada') }) it('should not request another update when stable function options refresh during host update', async () => { @@ -695,8 +695,8 @@ describe('createQueryController', () => { await vi.advanceTimersByTimeAsync(10) expect(query().isSuccess).toBe(true) expect(query().data).toBe('value-1') - expect(host.shadowRoot?.textContent).toContain('data: value-1') - expect(host.shadowRoot?.textContent).toContain('placeholder: false') + expect(host.shadowRoot).toHaveTextContent('data: value-1') + expect(host.shadowRoot).toHaveTextContent('placeholder: false') keyId = 2 host.requestUpdate() @@ -705,16 +705,16 @@ describe('createQueryController', () => { expect(query().isFetching).toBe(true) expect(query().isPlaceholderData).toBe(true) expect(query().data).toBe('value-1') - expect(host.shadowRoot?.textContent).toContain('data: value-1') - expect(host.shadowRoot?.textContent).toContain('placeholder: true') + expect(host.shadowRoot).toHaveTextContent('data: value-1') + expect(host.shadowRoot).toHaveTextContent('placeholder: true') resolveSecond?.('value-2') await vi.advanceTimersByTimeAsync(0) expect(query().isSuccess).toBe(true) expect(query().data).toBe('value-2') expect(query().isPlaceholderData).toBe(false) - expect(host.shadowRoot?.textContent).toContain('data: value-2') - expect(host.shadowRoot?.textContent).toContain('placeholder: false') + expect(host.shadowRoot).toHaveTextContent('data: value-2') + expect(host.shadowRoot).toHaveTextContent('placeholder: false') }) it('should refetch and update result state on invalidation', async () => { diff --git a/packages/lit-query/test-setup.ts b/packages/lit-query/test-setup.ts new file mode 100644 index 0000000000..a9d0dd31aa --- /dev/null +++ b/packages/lit-query/test-setup.ts @@ -0,0 +1 @@ +import '@testing-library/jest-dom/vitest' diff --git a/packages/lit-query/tsconfig.json b/packages/lit-query/tsconfig.json index 15d8fec4c8..32963ebc7e 100644 --- a/packages/lit-query/tsconfig.json +++ b/packages/lit-query/tsconfig.json @@ -5,5 +5,11 @@ "rootDir": ".", "lib": ["ES2022", "DOM"] }, - "include": ["src", "*.config.ts", "*.config.js", "package.json"] + "include": [ + "src", + "test-setup.ts", + "*.config.ts", + "*.config.js", + "package.json" + ] } diff --git a/packages/lit-query/vite.config.ts b/packages/lit-query/vite.config.ts index 363607106e..41897f2e31 100644 --- a/packages/lit-query/vite.config.ts +++ b/packages/lit-query/vite.config.ts @@ -19,6 +19,7 @@ export default defineConfig({ dir: './src', watch: false, environment: 'jsdom', + setupFiles: ['test-setup.ts'], include: ['tests/**/*.test.ts'], coverage: { enabled: !!process.env.CI,