From 09cf1e14db1422bb32137d2e9f6e4660a61ffacf Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskii Date: Mon, 20 Apr 2020 19:02:00 +0200 Subject: [PATCH 1/3] use jest node environment instead of mocking window object --- src/tests/useQuery-SSR.test.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/tests/useQuery-SSR.test.js b/src/tests/useQuery-SSR.test.js index a5d1a9f49d..183cb37851 100644 --- a/src/tests/useQuery-SSR.test.js +++ b/src/tests/useQuery-SSR.test.js @@ -1,22 +1,19 @@ +/** + * @jest-environment node + */ + import { cleanup } from '@testing-library/react' import React from 'react' import { renderToString } from 'react-dom/server' +import { usePaginatedQuery, queryCache } from '../index' describe('useQuery SSR', () => { - beforeEach(() => { - const windowSpy = jest.spyOn(global, 'window', 'get') - windowSpy.mockImplementation(() => undefined) - }) - afterEach(() => { cleanup() }) // See https://github.com/tannerlinsley/react-query/issues/70 it('should not cache queries on server', async () => { - // import react-query after mocking window - const { usePaginatedQuery, queryCache } = require('../index') - function Page() { const [page, setPage] = React.useState(1) const { resolvedData } = usePaginatedQuery( From 8b956378adffcab4758abe2c6cf7984f41ffde61 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskii Date: Mon, 20 Apr 2020 19:20:04 +0200 Subject: [PATCH 2/3] clear query cache after each test --- src/tests/useQuery-SSR.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/useQuery-SSR.test.js b/src/tests/useQuery-SSR.test.js index 183cb37851..0bc059f00a 100644 --- a/src/tests/useQuery-SSR.test.js +++ b/src/tests/useQuery-SSR.test.js @@ -9,6 +9,7 @@ import { usePaginatedQuery, queryCache } from '../index' describe('useQuery SSR', () => { afterEach(() => { + queryCache.clear() cleanup() }) From d65f44187d8d6ad2a79c154f4cf847af83a73a5e Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskii Date: Mon, 20 Apr 2020 19:28:59 +0200 Subject: [PATCH 3/3] remove unnecessary test cleanup --- src/tests/useQuery-SSR.test.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tests/useQuery-SSR.test.js b/src/tests/useQuery-SSR.test.js index 0bc059f00a..ea768d96c9 100644 --- a/src/tests/useQuery-SSR.test.js +++ b/src/tests/useQuery-SSR.test.js @@ -2,7 +2,6 @@ * @jest-environment node */ -import { cleanup } from '@testing-library/react' import React from 'react' import { renderToString } from 'react-dom/server' import { usePaginatedQuery, queryCache } from '../index' @@ -10,7 +9,6 @@ import { usePaginatedQuery, queryCache } from '../index' describe('useQuery SSR', () => { afterEach(() => { queryCache.clear() - cleanup() }) // See https://github.com/tannerlinsley/react-query/issues/70