From ecb21d9f6e902bb88306a0cf811a419b11c8a5ae Mon Sep 17 00:00:00 2001 From: jdecroock Date: Wed, 15 Mar 2023 19:56:01 +0100 Subject: [PATCH] remove exhcanges from tests --- docs/architecture.md | 3 +- exchanges/auth/src/authExchange.test.ts | 5 +- exchanges/context/src/context.test.ts | 5 +- .../graphcache/src/cacheExchange.test.ts | 50 +++++++++---------- .../graphcache/src/offlineExchange.test.ts | 7 +-- exchanges/refocus/src/refocusExchange.test.ts | 5 +- .../src/requestPolicyExchange.test.ts | 5 +- exchanges/retry/src/retryExchange.test.ts | 5 +- packages/core/src/client.test.ts | 3 +- packages/vue-urql/src/useClient.test.ts | 9 +--- 10 files changed, 36 insertions(+), 61 deletions(-) diff --git a/docs/architecture.md b/docs/architecture.md index 8d8fcba277..0c5f4d958b 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -45,11 +45,12 @@ Whenever we decide to send a request to our API we start by using `urql`'s extra information on how the GraphQL requests are executed. ```js -import { Client } from '@urql/core'; +import { Client, dedupExchange, cacheExchange, fetchExchange } from '@urql/core'; new Client({ url: 'http://localhost:3000/graphql', requestPolicy: 'cache-first', + exchanges: [dedupExchange, cacheExchange, fetchExchange] }); ``` diff --git a/exchanges/auth/src/authExchange.test.ts b/exchanges/auth/src/authExchange.test.ts index 2f095351f8..37d648615b 100644 --- a/exchanges/auth/src/authExchange.test.ts +++ b/exchanges/auth/src/authExchange.test.ts @@ -17,9 +17,6 @@ import { Client, Operation, OperationResult, - dedupExchange, - cacheExchange, - fetchExchange, } from '@urql/core'; import { vi, expect, it } from 'vitest'; @@ -45,7 +42,7 @@ const makeExchangeArgs = () => { ), client: new Client({ url: '/api', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }), } as any, }; diff --git a/exchanges/context/src/context.test.ts b/exchanges/context/src/context.test.ts index 6f91ffe76c..9702a8f3ad 100644 --- a/exchanges/context/src/context.test.ts +++ b/exchanges/context/src/context.test.ts @@ -7,9 +7,6 @@ import { Operation, OperationResult, ExchangeIO, - dedupExchange, - cacheExchange, - fetchExchange, } from '@urql/core'; import { contextExchange } from './context'; @@ -37,7 +34,7 @@ let client, op, ops$, next; beforeEach(() => { client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); op = client.createRequestOperation('query', { key: 1, diff --git a/exchanges/graphcache/src/cacheExchange.test.ts b/exchanges/graphcache/src/cacheExchange.test.ts index 2290941755..6e1c425d17 100644 --- a/exchanges/graphcache/src/cacheExchange.test.ts +++ b/exchanges/graphcache/src/cacheExchange.test.ts @@ -5,8 +5,6 @@ import { Operation, OperationResult, CombinedError, - dedupExchange, - fetchExchange, } from '@urql/core'; import { vi, expect, it, describe } from 'vitest'; @@ -58,7 +56,7 @@ describe('data dependencies', () => { it('writes queries to the cache', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const op = client.createRequestOperation('query', { key: 1, @@ -118,7 +116,7 @@ describe('data dependencies', () => { it('respects cache-only operations', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const op = client.createRequestOperation( 'query', @@ -184,7 +182,7 @@ describe('data dependencies', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -317,7 +315,7 @@ describe('data dependencies', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -427,7 +425,7 @@ describe('data dependencies', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); const reexec = vi @@ -492,7 +490,7 @@ describe('data dependencies', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -552,7 +550,7 @@ describe('data dependencies', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -608,7 +606,7 @@ describe('data dependencies', () => { it('marks errored null fields as uncached but delivers them as expected', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -708,7 +706,7 @@ describe('optimistic updates', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -804,7 +802,7 @@ describe('optimistic updates', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -904,7 +902,7 @@ describe('optimistic updates', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -1024,7 +1022,7 @@ describe('optimistic updates', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -1110,7 +1108,7 @@ describe('custom resolvers', () => { it('follows resolvers on initial write', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -1186,7 +1184,7 @@ describe('custom resolvers', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -1273,7 +1271,7 @@ describe('custom resolvers', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); @@ -1442,7 +1440,7 @@ describe('schema awareness', () => { vi.useFakeTimers(); const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); const reexec = vi @@ -1588,7 +1586,7 @@ describe('schema awareness', () => { vi.useFakeTimers(); const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next } = makeSubject(); const reexec = vi @@ -1714,7 +1712,7 @@ describe('commutativity', () => { const client = createClient({ url: 'http://0.0.0.0', requestPolicy: 'cache-and-network', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: next } = makeSubject(); const query = gql` @@ -1802,7 +1800,7 @@ describe('commutativity', () => { let data: any; const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: nextOp } = makeSubject(); const { source: res$, next: nextRes } = makeSubject(); @@ -1895,7 +1893,7 @@ describe('commutativity', () => { let data: any; const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: nextOp } = makeSubject(); const { source: res$, next: nextRes } = makeSubject(); @@ -2014,7 +2012,7 @@ describe('commutativity', () => { let data: any; const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: nextOp } = makeSubject(); const { source: res$, next: nextRes } = makeSubject(); @@ -2116,7 +2114,7 @@ describe('commutativity', () => { let data: any; const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: nextOp } = makeSubject(); const { source: res$, next: nextRes } = makeSubject(); @@ -2214,7 +2212,7 @@ describe('commutativity', () => { let data: any; const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: nextOp } = makeSubject(); const { source: res$, next: nextRes } = makeSubject(); @@ -2354,7 +2352,7 @@ describe('commutativity', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange({}), fetchExchange], + exchanges: [], }); const { source: ops$, next: nextOp } = makeSubject(); const { source: res$, next: nextRes } = makeSubject(); diff --git a/exchanges/graphcache/src/offlineExchange.test.ts b/exchanges/graphcache/src/offlineExchange.test.ts index 53c299aa08..0b4fc307c0 100644 --- a/exchanges/graphcache/src/offlineExchange.test.ts +++ b/exchanges/graphcache/src/offlineExchange.test.ts @@ -4,9 +4,6 @@ import { ExchangeIO, Operation, OperationResult, - dedupExchange, - cacheExchange, - fetchExchange, } from '@urql/core'; import { print } from 'graphql'; import { vi, expect, it, describe } from 'vitest'; @@ -189,7 +186,7 @@ describe('offline', () => { it('should intercept errored queries', async () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); const onlineSpy = vi .spyOn(navigator, 'onLine', 'get') @@ -257,7 +254,7 @@ describe('offline', () => { const client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); const reexecuteOperation = vi .spyOn(client, 'reexecuteOperation') diff --git a/exchanges/refocus/src/refocusExchange.test.ts b/exchanges/refocus/src/refocusExchange.test.ts index b98d8039cf..605e613eb1 100644 --- a/exchanges/refocus/src/refocusExchange.test.ts +++ b/exchanges/refocus/src/refocusExchange.test.ts @@ -7,9 +7,6 @@ import { Operation, OperationResult, ExchangeIO, - dedupExchange, - cacheExchange, - fetchExchange, } from '@urql/core'; import { refocusExchange } from './refocusExchange'; @@ -38,7 +35,7 @@ let client, op, ops$, next; beforeEach(() => { client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); op = client.createRequestOperation('query', { key: 1, diff --git a/exchanges/request-policy/src/requestPolicyExchange.test.ts b/exchanges/request-policy/src/requestPolicyExchange.test.ts index 984a33eb4f..5a44a9f907 100644 --- a/exchanges/request-policy/src/requestPolicyExchange.test.ts +++ b/exchanges/request-policy/src/requestPolicyExchange.test.ts @@ -7,9 +7,6 @@ import { Operation, OperationResult, ExchangeIO, - dedupExchange, - cacheExchange, - fetchExchange, } from '@urql/core'; import { requestPolicyExchange } from './requestPolicyExchange'; @@ -42,7 +39,7 @@ let client, op, ops$, next; beforeEach(() => { client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); op = client.createRequestOperation('query', { key: 1, diff --git a/exchanges/retry/src/retryExchange.test.ts b/exchanges/retry/src/retryExchange.test.ts index 59cd3f0b6e..41be980d75 100644 --- a/exchanges/retry/src/retryExchange.test.ts +++ b/exchanges/retry/src/retryExchange.test.ts @@ -8,9 +8,6 @@ import { Operation, OperationResult, ExchangeIO, - dedupExchange, - cacheExchange, - fetchExchange, } from '@urql/core'; import { retryExchange } from './retryExchange'; @@ -60,7 +57,7 @@ let client, op, ops$, next; beforeEach(() => { client = createClient({ url: 'http://0.0.0.0', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); op = client.createRequestOperation('query', { key: 1, diff --git a/packages/core/src/client.test.ts b/packages/core/src/client.test.ts index 0010b1833b..62e740c9f3 100755 --- a/packages/core/src/client.test.ts +++ b/packages/core/src/client.test.ts @@ -26,7 +26,6 @@ import { Exchange, Operation, OperationResult } from './types'; import { makeOperation } from './utils'; import { Client, createClient } from './client'; import { queryOperation, subscriptionOperation } from './test-utils'; -import { cacheExchange, dedupExchange, fetchExchange } from '.'; const url = 'https://hostname.com'; @@ -81,7 +80,7 @@ const subscription = { let receivedOps: Operation[] = []; let client = createClient({ url: '1234', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }); const receiveMock = vi.fn((s: Source) => pipe( diff --git a/packages/vue-urql/src/useClient.test.ts b/packages/vue-urql/src/useClient.test.ts index 7c7f52102c..0c901e6230 100644 --- a/packages/vue-urql/src/useClient.test.ts +++ b/packages/vue-urql/src/useClient.test.ts @@ -1,12 +1,7 @@ import { expect, it, describe } from 'vitest'; import { defineComponent } from 'vue'; import { mount } from '@vue/test-utils'; -import { - cacheExchange, - Client, - dedupExchange, - fetchExchange, -} from '@urql/core'; +import { Client } from '@urql/core'; import { useClient, provideClient } from './useClient'; describe('provideClient', () => { @@ -16,7 +11,7 @@ describe('provideClient', () => { provideClient( new Client({ url: 'test', - exchanges: [dedupExchange, cacheExchange, fetchExchange], + exchanges: [], }) );