+
@@ -552,11 +616,10 @@ describe('useQuery Hook', () => {
);
- waitFor(() => {
+ await waitFor(() => {
expect(renderCount).toBe(6);
- }).finally(() => {
- console.error = consoleError;
- }).then(resolve, reject);
+ })
+ console.error = consoleError;
});
it('should tear down the query on unmount', async () => {
@@ -677,15 +740,27 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current[0].loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current[0].data).toEqual(allPeopleData);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current[1].loading).toBe(true);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current[1].data).toBe(undefined);
}, { interval: 1 });
await waitFor(() => {
expect(result.current[0].loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current[0].data).toEqual(allPeopleData);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current[1].loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current[1].data).toEqual(allThingsData);
}, { interval: 1 });
@@ -1375,9 +1450,13 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ });
+ await waitFor(() => {
expect(result.current.data).toEqual({
linkCount: 2,
});
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.networkStatus).toBe(NetworkStatus.ready);
}, { interval: 1 });
@@ -1585,14 +1664,22 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
}, { interval: 1 });
- expect(result.current.data).toEqual({ hello: "world 1" });
- expect(requestSpy).toHaveBeenCalledTimes(1);
+ await waitFor(() => {
+ expect(result.current.data).toEqual({ hello: "world 1" });
+ });
+ await waitFor(() => {
+ expect(requestSpy).toHaveBeenCalledTimes(1);
+ })
unmount();
+
await expect(waitFor(() => {
expect(requestSpy).not.toHaveBeenCalledTimes(1);
}, { interval: 1, timeout: 20 })).rejects.toThrow();
- expect(onErrorFn).toHaveBeenCalledTimes(0);
+ await waitFor(() => {
+ expect(onErrorFn).toHaveBeenCalledTimes(0);
+ });
+ requestSpy.mockRestore();
});
it('should stop polling when component is unmounted in Strict Mode', async () => {
@@ -1646,6 +1733,7 @@ describe('useQuery Hook', () => {
expect(requestSpy).not.toHaveBeenCalledTimes(1);
}, { interval: 1, timeout: 20 })).rejects.toThrow();
expect(onErrorFn).toHaveBeenCalledTimes(0);
+ requestSpy.mockRestore();
});
it('should start and stop polling in Strict Mode', async () => {
@@ -1702,6 +1790,7 @@ describe('useQuery Hook', () => {
expect(result.current.loading).toBe(false);
expect(requestSpy).toHaveBeenCalledTimes(2);
expect(onErrorFn).toHaveBeenCalledTimes(0);
+ requestSpy.mockRestore();
});
it('should not throw an error if stopPolling is called manually', async () => {
@@ -1813,6 +1902,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(onError).toHaveBeenCalledTimes(1);
+ });
+ await waitFor(() => {
expect(onError).toHaveBeenCalledWith(
new ApolloError({ graphQLErrors: [new GraphQLError('error')] })
);
@@ -1856,6 +1947,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(onError).toHaveBeenCalledTimes(1);
+ });
+ await waitFor(() => {
expect(onError).toHaveBeenCalledWith(
new ApolloError({ networkError: new Error('Could not fetch') })
);
@@ -1976,6 +2069,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(onError).toHaveBeenCalledTimes(1);
+ });
+ await waitFor(() => {
expect(onError).toHaveBeenCalledWith(
new ApolloError({ networkError: new Error('Could not fetch') })
);
@@ -2051,8 +2146,11 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(onCompleted).toHaveBeenCalledTimes(1);
+ });
+ await waitFor(() => {
expect(onCompleted).toHaveBeenCalledWith({ hello: null });
-
+ });
+ await waitFor(() => {
expect(onError).not.toHaveBeenCalled();
});
});
@@ -2095,6 +2193,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(onError).toHaveBeenCalledTimes(1);
+ });
+ await waitFor(() => {
expect(onError).toHaveBeenCalledWith(
new ApolloError({ graphQLErrors: [new GraphQLError('error')] })
);
@@ -2179,14 +2279,17 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(onError).toHaveBeenCalledTimes(1);
+ });
+ await waitFor(() => {
expect(onError).toHaveBeenCalledWith(
new ApolloError({
graphQLErrors: [new GraphQLError('Could not fetch "hello"')]
})
);
-
+ });
+ await waitFor(() => {
expect(onCompleted).not.toHaveBeenCalled();
- })
+ });
});
it('calls `onError` a single time when refetching returns a successful result', async () => {
@@ -3457,8 +3560,14 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({ hello: 'world' });
+ }, { interval: 1 });
+ await waitFor(() => {
expect(onCompleted).toHaveBeenCalledTimes(1);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(onCompleted).toHaveBeenCalledWith({ hello: 'world' });
}, { interval: 1 });
expect(onCompleted).toHaveBeenCalledTimes(1);
@@ -3679,8 +3788,8 @@ describe('useQuery Hook', () => {
);
};
- const { findByText } = render();
- await findByText("onCompletedCalled: true");
+ render();
+ await screen.findByText("onCompletedCalled: true");
expect(errorSpy).not.toHaveBeenCalled();
errorSpy.mockRestore();
});
@@ -4982,68 +5091,132 @@ describe('useQuery Hook', () => {
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
+ const { loading } = result.current.useQueryResult;
expect(loading).toBe(true);
- expect(data).toBeUndefined();
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { data } = result.current.useQueryResult;
+ if (IS_REACT_18) {
+ expect(data).toBeUndefined();
+ } else {
+ expect(data).toEqual({ a: "a" });
+ }
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
expect(previousData).toBeUndefined();
}, { interval: 1 });
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
+ const { loading } = result.current.useQueryResult;
expect(loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { data } = result.current.useQueryResult;
expect(data).toEqual({ a: "a" });
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
expect(previousData).toBe(undefined);
}, { interval: 1 });
- await expect(waitFor(() => {
+ await expect(await waitFor(() => {
result.current.setQuery(abQuery);
}, { interval: 1 }));
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
- expect(loading).toBe(true);
- expect(data).toBeUndefined();
+ const { loading } = result.current.useQueryResult;
+ if (IS_REACT_18) {
+ expect(loading).toBe(true);
+ } else {
+ expect(loading).toBe(false);
+ }
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { data } = result.current.useQueryResult;
+ if (IS_REACT_18) {
+ expect(data).toBeUndefined();
+ } else {
+ expect(data).toEqual({ a: "aa", b: 1 });
+ }
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
expect(previousData).toEqual({ a: "a" });
}, { interval: 1 });
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
+ const { loading } = result.current.useQueryResult;
expect(loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { data } = result.current.useQueryResult;
expect(data).toEqual({ a: "aa", b: 1 });
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
expect(previousData).toEqual({ a: "a" });
}, { interval: 1 });
- await expect(waitFor(() => {
+ await waitFor(() => {
result.current.useQueryResult.reobserve().then(result => {
expect(result.loading).toBe(false);
expect(result.data).toEqual({ a: "aaa", b: 2 });
});
- }, { interval: 1 }));
+ }, { interval: 1 });
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
+ const { loading } = result.current.useQueryResult;
expect(loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { data } = result.current.useQueryResult;
expect(data).toEqual({ a: "aaa", b: 2 });
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
expect(previousData).toEqual({ a: "aa", b: 1 });
}, { interval: 1 });
- await expect(waitFor(() => {
+ await waitFor(() => {
result.current.setQuery(bQuery);
- }, { interval: 1 }));
+ }, { interval: 1 });
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
- expect(loading).toBe(true);
- expect(data).toEqual({ b: 2 });
- expect(previousData).toEqual({ a: "aaa", b: 2 });
+ const { loading } = result.current.useQueryResult;
+ if (IS_REACT_18) {
+ expect(loading).toBe(true);
+ } else {
+ expect(loading).toBe(false);
+ }
}, { interval: 1 });
-
await waitFor(() => {
- const { loading, data, previousData } = result.current.useQueryResult;
- expect(loading).toBe(false);
+ const { data } = result.current.useQueryResult;
+ if (IS_REACT_18) {
+ expect(data).toEqual({ b: 2 });
+ } else {
+ expect(data).toEqual({ b: 3 });
+ }
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
+ if (IS_REACT_18) {
+ expect(previousData).toEqual({ a: "aaa", b: 2 });
+ } else {
+ expect(previousData).toEqual({ b: 2 });
+ }
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { loading } = result.current.useQueryResult;
expect(loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { data } = result.current.useQueryResult;
expect(data).toEqual({ b: 3 });
+ }, { interval: 1 });
+ await waitFor(() => {
+ const { previousData } = result.current.useQueryResult;
expect(previousData).toEqual({ b: 2 });
}, { interval: 1 });
});
@@ -5196,16 +5369,22 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({ hello: 'world 1' });
}, { interval: 1 });
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({ hello: 'world 2' });
}, { interval: 1 });
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({ hello: 'world 3' });
}, { interval: 1 });
});
@@ -5285,6 +5464,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({ results });
}, { interval: 1 });
expect(result.current.data.results.length).toBe(7);
@@ -5372,6 +5553,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({ results });
}, { interval: 1 });
expect(result.current.data.results.length).toBe(7);
@@ -5461,6 +5644,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.a.loading).toBe(false);
+ });
+ await waitFor(() => {
expect(result.current.b.loading).toBe(false);
});
expect(result.current.a.data).toEqual(aData);
@@ -5514,7 +5699,7 @@ describe('useQuery Hook', () => {
});
describe('regression test issue #9204', () => {
- itAsync('should handle a simple query', (resolve, reject) => {
+ it('should handle a simple query', async () => {
const query = gql`{ hello }`;
const mocks = [
{
@@ -5533,7 +5718,7 @@ describe('useQuery Hook', () => {
* this component will re-render in an infinite loop.
*/
if (counter > 10) {
- reject(new Error(`Too many results (${counter})`));
+ console.error(`Too many results (${counter})`);
} else {
setCounter(c => c + 1);
}
@@ -5547,15 +5732,15 @@ describe('useQuery Hook', () => {
return {result.data.hello}{counter}
;
}
- const { getByText } = render(
+ render(
);
- waitFor(() => {
- expect(getByText('world2')).toBeTruthy();
- }).then(resolve, reject);
+ await waitFor(() => {
+ expect(screen.getByText('world2')).toBeTruthy();
+ });
});
});
@@ -5638,6 +5823,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
message: 'Hello world',
@@ -5729,6 +5916,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greetings: [
{
@@ -5761,6 +5950,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greetings: [
{
@@ -5845,6 +6036,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
allProducts: [
{
@@ -5903,6 +6096,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
allProducts: [
{
@@ -5980,6 +6175,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
message: 'Hello world',
@@ -6008,6 +6205,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
message: 'Hello world',
@@ -6082,6 +6281,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
hero: {
heroFriends: [
@@ -6129,10 +6330,14 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
- expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.error).toBeInstanceOf(ApolloError);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.error!.message).toBe('homeWorld for character with ID 1000 could not be fetched.');
-
+ }, { interval: 1 });
+ await waitFor(() => {
// since default error policy is "none", we do *not* return partial results
expect(result.current.data).toEqual({
hero: {
@@ -6213,6 +6418,8 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
hero: {
heroFriends: [
@@ -6264,13 +6471,22 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
// @ts-ignore
expect(result.current.label).toBe(undefined);
+ }, { interval: 1 });
+ await waitFor(() => {
// @ts-ignore
expect(result.current.extensions).toBe(undefined);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.error).toBeInstanceOf(ApolloError);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.error!.message).toBe('homeWorld for character with ID 1000 could not be fetched.');
-
+ }, { interval: 1 });
+ await waitFor(() => {
// since default error policy is "all", we *do* return partial results
expect(result.current.data).toEqual({
hero: {
@@ -6355,7 +6571,11 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.networkStatus).toBe(NetworkStatus.ready);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
__typename: 'Greeting',
@@ -6382,7 +6602,11 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.networkStatus).toBe(NetworkStatus.ready);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
__typename: 'Greeting',
@@ -6458,7 +6682,11 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.networkStatus).toBe(NetworkStatus.ready);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
__typename: 'Greeting',
@@ -6485,7 +6713,11 @@ describe('useQuery Hook', () => {
await waitFor(() => {
expect(result.current.loading).toBe(false);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.networkStatus).toBe(NetworkStatus.ready);
+ }, { interval: 1 });
+ await waitFor(() => {
expect(result.current.data).toEqual({
greeting: {
__typename: 'Greeting',
diff --git a/src/react/hooks/__tests__/useReactiveVar.test.tsx b/src/react/hooks/__tests__/useReactiveVar.test.tsx
index 1416d460f74..1de2f010ac5 100644
--- a/src/react/hooks/__tests__/useReactiveVar.test.tsx
+++ b/src/react/hooks/__tests__/useReactiveVar.test.tsx
@@ -1,5 +1,5 @@
import React, { StrictMode, useEffect } from "react";
-import { render, waitFor, act } from "@testing-library/react";
+import { screen, render, waitFor, act } from "@testing-library/react";
import { itAsync } from "../../../testing";
import { makeVar } from "../../../core";
@@ -8,7 +8,7 @@ import { useReactiveVar } from "../useReactiveVar";
const IS_REACT_18 = React.version.startsWith('18');
describe("useReactiveVar Hook", () => {
- itAsync("works with one component", (resolve, reject) => {
+ it("works with one component", async () => {
const counterVar = makeVar(0);
let renderCount = 0;
@@ -29,7 +29,7 @@ describe("useReactiveVar Hook", () => {
expect(count).toBe(3);
break;
default:
- reject(`too many (${renderCount}) renders`);
+ console.error(`too many (${renderCount}) renders`);
}
});
@@ -38,10 +38,12 @@ describe("useReactiveVar Hook", () => {
render();
- waitFor(() => {
+ await waitFor(() => {
expect(renderCount).toBe(3);
+ });
+ await waitFor(() => {
expect(counterVar()).toBe(3);
- }).then(resolve, reject);
+ });
});
itAsync("works when two components share a variable", async (resolve, reject) => {
@@ -93,6 +95,9 @@ describe("useReactiveVar Hook", () => {
await waitFor(() => {
expect(parentRenderCount).toBe(1);
+ });
+
+ await waitFor(() => {
expect(childRenderCount).toBe(1);
});
@@ -103,6 +108,8 @@ describe("useReactiveVar Hook", () => {
await waitFor(() => {
expect(parentRenderCount).toBe(2);
+ });
+ await waitFor(() => {
expect(childRenderCount).toBe(2);
});
@@ -113,6 +120,8 @@ describe("useReactiveVar Hook", () => {
await waitFor(() => {
expect(parentRenderCount).toBe(3);
+ });
+ await waitFor(() => {
expect(childRenderCount).toBe(3);
});
@@ -121,7 +130,7 @@ describe("useReactiveVar Hook", () => {
resolve();
});
- itAsync("does not update if component has been unmounted", (resolve, reject) => {
+ it("does not update if component has been unmounted", async () => {
const counterVar = makeVar(0);
let renderCount = 0;
let attemptedUpdateAfterUnmount = false;
@@ -161,19 +170,23 @@ describe("useReactiveVar Hook", () => {
const { unmount } = render();
- return waitFor(() => {
+ await waitFor(() => {
expect(attemptedUpdateAfterUnmount).toBe(true);
- }).then(() => {
+ });
+ await waitFor(() => {
expect(renderCount).toBe(3);
+ })
+ await waitFor(() => {
expect(counterVar()).toBe(6);
+ })
+ await waitFor(() => {
expect(consoleErrorArgs).toEqual([]);
- }).finally(() => {
- console.error = error;
- }).then(resolve, reject);
+ })
+ console.error = error;
});
describe("useEffect", () => {
- itAsync("works if updated higher in the component tree", async (resolve, reject) => {
+ it("works if updated higher in the component tree", async () => {
const counterVar = makeVar(0);
function ComponentOne() {
@@ -192,7 +205,7 @@ describe("useReactiveVar Hook", () => {
return ({count}
);
}
- const { getAllByText } = render(
+ render(
<>
@@ -200,13 +213,11 @@ describe("useReactiveVar Hook", () => {
);
await waitFor(() => {
- expect(getAllByText("1")).toHaveLength(2);
+ expect(screen.getAllByText("1")).toHaveLength(2);
});
-
- resolve();
});
- itAsync("works if updated lower in the component tree", async (resolve, reject) => {
+ it("works if updated lower in the component tree", async () => {
const counterVar = makeVar(0);
function ComponentOne() {
@@ -225,7 +236,7 @@ describe("useReactiveVar Hook", () => {
return ({count}
);
}
- const { getAllByText } = render(
+ render(
<>
@@ -233,10 +244,8 @@ describe("useReactiveVar Hook", () => {
);
await waitFor(() => {
- expect(getAllByText("1")).toHaveLength(2);
+ expect(screen.getAllByText("1")).toHaveLength(2);
});
-
- resolve();
});
itAsync("works with strict mode", async (resolve, reject) => {
@@ -290,7 +299,7 @@ describe("useReactiveVar Hook", () => {
return ({count}
);
}
- const { getAllByText } = render();
+ render();
Promise.resolve().then(() => {
counterVar(1);
counterVar(2);
@@ -305,7 +314,7 @@ describe("useReactiveVar Hook", () => {
});
await waitFor(() => {
- expect(getAllByText("10")).toHaveLength(1);
+ expect(screen.getAllByText("10")).toHaveLength(1);
});
resolve();
diff --git a/src/react/hooks/__tests__/useSubscription.test.tsx b/src/react/hooks/__tests__/useSubscription.test.tsx
index 091cfb71a98..1c208814bef 100644
--- a/src/react/hooks/__tests__/useSubscription.test.tsx
+++ b/src/react/hooks/__tests__/useSubscription.test.tsx
@@ -4,14 +4,17 @@ import gql from 'graphql-tag';
import { ApolloClient, ApolloError, ApolloLink, concat } from '../../../core';
import { InMemoryCache as Cache } from '../../../cache';
-import { ApolloProvider } from '../../context';
+import { ApolloProvider, resetApolloContext } from '../../context';
import { MockSubscriptionLink } from '../../../testing';
import { useSubscription } from '../useSubscription';
describe('useSubscription Hook', () => {
- afterEach(() => {
+ beforeEach(() => {
jest.restoreAllMocks();
});
+ afterEach(() => {
+ resetApolloContext();
+ });
it('should handle a simple subscription properly', async () => {
const subscription = gql`
@@ -641,6 +644,7 @@ describe('useSubscription Hook', () => {
expect(warningSpy).toHaveBeenCalledTimes(1);
expect(warningSpy).toHaveBeenCalledWith(expect.stringContaining("supports only the 'onSubscriptionData' or 'onData' option"));
+ warningSpy.mockRestore();
});
test("prefers 'onData' when using 'onSubscriptionData' and 'onData' together", async () => {
@@ -685,12 +689,12 @@ describe('useSubscription Hook', () => {
setTimeout(() => link.simulateResult(results[0]));
await waitFor(() => {
expect(onData).toHaveBeenCalledTimes(1);
- expect(onSubscriptionData).toHaveBeenCalledTimes(0);
}, { interval: 1 });
+ expect(onSubscriptionData).toHaveBeenCalledTimes(0);
});
test("uses 'onSubscriptionData' when 'onData' is absent", async () => {
- jest.spyOn(console, 'warn').mockImplementation(() => {});
+ const warningSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
const subscription = gql`
subscription {
car {
@@ -730,6 +734,7 @@ describe('useSubscription Hook', () => {
await waitFor(() => {
expect(onSubscriptionData).toHaveBeenCalledTimes(1);
}, { interval: 1 });
+ warningSpy.mockRestore();
});
test("only warns once using `onSubscriptionData`", () => {
@@ -764,6 +769,7 @@ describe('useSubscription Hook', () => {
rerender();
expect(warningSpy).toHaveBeenCalledTimes(1);
+ warningSpy.mockRestore();
});
test("should warn when using 'onComplete' and 'onSubscriptionComplete' together", () => {
@@ -798,10 +804,11 @@ describe('useSubscription Hook', () => {
expect(warningSpy).toHaveBeenCalledTimes(1);
expect(warningSpy).toHaveBeenCalledWith(expect.stringContaining("supports only the 'onSubscriptionComplete' or 'onComplete' option"));
+ warningSpy.mockRestore();
});
test("prefers 'onComplete' when using 'onComplete' and 'onSubscriptionComplete' together", async () => {
- jest.spyOn(console, 'warn').mockImplementation(() => {});
+ const warningSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
const subscription = gql`
subscription {
car {
@@ -842,13 +849,13 @@ describe('useSubscription Hook', () => {
setTimeout(() => link.simulateComplete());
await waitFor(() => {
expect(onComplete).toHaveBeenCalledTimes(1);
- expect(onSubscriptionComplete).toHaveBeenCalledTimes(0);
}, { interval: 1 });
-
+ expect(onSubscriptionComplete).toHaveBeenCalledTimes(0);
+ warningSpy.mockRestore();
});
test("uses 'onSubscriptionComplete' when 'onComplete' is absent", async () => {
- jest.spyOn(console, 'warn').mockImplementation(() => {});
+ const warningSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
const subscription = gql`
subscription {
car {
@@ -888,7 +895,7 @@ describe('useSubscription Hook', () => {
await waitFor(() => {
expect(onSubscriptionComplete).toHaveBeenCalledTimes(1);
}, { interval: 1 });
-
+ warningSpy.mockRestore();
});
test("only warns once using `onSubscriptionComplete`", () => {
@@ -923,5 +930,6 @@ describe('useSubscription Hook', () => {
rerender();
expect(warningSpy).toHaveBeenCalledTimes(1);
+ warningSpy.mockRestore();
});
});
diff --git a/src/react/ssr/__tests__/useQuery.test.tsx b/src/react/ssr/__tests__/useQuery.test.tsx
index d8ee7847dcf..6fb118a839b 100644
--- a/src/react/ssr/__tests__/useQuery.test.tsx
+++ b/src/react/ssr/__tests__/useQuery.test.tsx
@@ -173,12 +173,12 @@ describe('useQuery Hook SSR', () => {
);
- const result = await renderToStringWithData(app);
+ const view = await renderToStringWithData(app);
expect(renderCount).toBe(1);
- expect(result).toEqual('');
+ expect(view).toEqual('');
await new Promise((resolve) => setTimeout(resolve, 20));
expect(renderCount).toBe(1);
- expect(result).toEqual('');
+ expect(view).toEqual('');
}
);
diff --git a/src/testing/react/__tests__/MockedProvider.test.tsx b/src/testing/react/__tests__/MockedProvider.test.tsx
index 58f54f866db..d2355accc7a 100644
--- a/src/testing/react/__tests__/MockedProvider.test.tsx
+++ b/src/testing/react/__tests__/MockedProvider.test.tsx
@@ -424,7 +424,7 @@ describe('General use', () => {
}).then(resolve, reject);
});
- itAsync('should return "No more mocked responses" errors in response', (resolve, reject) => {
+ it('should return "No more mocked responses" errors in response', async () => {
let finished = false;
function Component() {
const { loading, error } = useQuery(query);
@@ -443,15 +443,15 @@ describe('General use', () => {
);
- waitFor(() => {
+ await waitFor(() => {
expect(finished).toBe(true);
- // The "No more mocked responses" error should not be thrown as an
- // uncaught exception.
- expect(errorThrown).toBeFalsy();
- }).then(resolve, reject);
+ });
+ // The "No more mocked responses" error should not be thrown as an
+ // uncaught exception.
+ expect(errorThrown).toBeFalsy();
});
- itAsync('should return "Mocked response should contain" errors in response', (resolve, reject) => {
+ it('should return "Mocked response should contain" errors in response', async () => {
let finished = false;
function Component({ ...variables }: Variables) {
const { loading, error } = useQuery