Added @apollo/client/testing/core entry point

CHANGELOG.md

@@ -27,6 +27,9 @@
 - The `HttpLink` constructor now accepts an optional `print` function that can be used to customize how GraphQL `DocumentNode` objects are transformed back into strings before they are sent over the network. <br/>
   [@sarahgp](https://github.com/sarahgp) in [#8699](https://github.com/apollographql/apollo-client/pull/8699)
 
+- A new nested entry point called `@apollo/client/testing/core` has been created. Importing from this entry point instead of `@apollo/client/testing` excludes any React-related dependencies. <br/>
+  [@wassim-k](https://github.com/wassim-k) in [#8687](https://github.com/apollographql/apollo-client/pull/8687)
+
 ### React Refactoring
 
 #### Bug Fixes (due to [@brainkim](https://github.com/brainkim) in [#8596](https://github.com/apollographql/apollo-client/pull/8596)):

config/entryPoints.js

@@ -22,6 +22,7 @@ const entryPoints = [
   { dirs: ['react', 'parser'] },
   { dirs: ['react', 'ssr'] },
   { dirs: ['testing'], extensions: [".js", ".jsx"] },
+  { dirs: ['testing', 'core'] },
   { dirs: ['utilities'] },
   { dirs: ['utilities', 'globals'], sideEffects: true },
 ];

src/__tests__/__snapshots__/exports.ts.snap

@@ -315,6 +315,21 @@ Array [
 ]
 `;
 
+exports[`exports of public entry points @apollo/client/testing/core 1`] = `
+Array [
+  "MockLink",
+  "MockSubscriptionLink",
+  "createMockClient",
+  "itAsync",
+  "mockObservableLink",
+  "mockSingleLink",
+  "subscribeAndCount",
+  "withErrorSpy",
+  "withLogSpy",
+  "withWarningSpy",
+]
+`;
+
 exports[`exports of public entry points @apollo/client/utilities 1`] = `
 Array [
   "Concast",

src/__tests__/exports.ts

@@ -21,6 +21,7 @@ import * as reactHooks from "../react/hooks";
 import * as reactParser from "../react/parser";
 import * as reactSSR from "../react/ssr";
 import * as testing from "../testing";
+import * as testingCore from "../testing/core";
 import * as utilities from "../utilities";
 import * as utilitiesGlobals from "../utilities/globals";
 
@@ -61,6 +62,7 @@ describe('exports of public entry points', () => {
   check("@apollo/client/react/parser", reactParser);
   check("@apollo/client/react/ssr", reactSSR);
   check("@apollo/client/testing", testing);
+  check("@apollo/client/testing/core", testingCore);
   check("@apollo/client/utilities", utilities);
   check("@apollo/client/utilities/globals", utilitiesGlobals);
 

src/__tests__/local-state/resolvers.ts

@@ -15,8 +15,8 @@ import { InMemoryCache } from '../../cache';
 import { Observable, Observer } from '../../utilities';
 import { ApolloLink } from '../../link/core';
 import { itAsync } from '../../testing';
-import mockQueryManager from '../../testing/mocking/mockQueryManager';
-import wrap from '../../testing/wrap';
+import mockQueryManager from '../../testing/core/mocking/mockQueryManager';
+import wrap from '../../testing/core/wrap';
 
 // Helper method that sets up a mockQueryManager and then passes on the
 // results to an observer.

src/__tests__/refetchQueries.ts

@@ -1,6 +1,6 @@
 import { Subscription } from "zen-observable-ts";
 
-import { itAsync } from '../testing/itAsync';
+import { itAsync } from '../testing';
 import {
   ApolloClient,
   ApolloLink,

src/cache/inmemory/__tests__/policies.ts

@@ -5,11 +5,14 @@ import { ReactiveVar, makeVar } from "../reactiveVars";
 import { Reference, StoreObject, ApolloClient, NetworkStatus, TypedDocumentNode, DocumentNode } from "../../../core";
 import { MissingFieldError } from "../..";
 import { relayStylePagination } from "../../../utilities";
-import { MockLink } from '../../../testing/mocking/mockLink';
-import subscribeAndCount from '../../../testing/subscribeAndCount';
-import { itAsync } from '../../../testing/itAsync';
 import { FieldPolicy, StorageType } from "../policies";
-import { withErrorSpy, withWarningSpy } from "../../../testing";
+import {
+  itAsync,
+  withErrorSpy,
+  withWarningSpy,
+  subscribeAndCount,
+  MockLink,
+} from "../../../testing/core";
 
 function reverse(s: string) {
   return s.split("").reverse().join("");

src/cache/inmemory/__tests__/writeToStore.ts

@@ -18,7 +18,7 @@ import {
 } from '../../../utilities/graphql/storeUtils';
 import { addTypenameToDocument } from '../../../utilities/graphql/transform';
 import { cloneDeep } from '../../../utilities/common/cloneDeep';
-import { itAsync } from '../../../testing/itAsync';
+import { itAsync } from '../../../testing/core';
 import { StoreWriter } from '../writeToStore';
 import { defaultNormalizedCacheFactory, writeQueryToStore } from './helpers';
 import { InMemoryCache } from '../inMemoryCache';

src/core/__tests__/ObservableQuery.ts

@@ -12,9 +12,9 @@ import { InMemoryCache, NormalizedCacheObject } from '../../cache';
 import { ApolloError } from '../../errors';
 
 import { itAsync, mockSingleLink, subscribeAndCount } from '../../testing';
-import mockQueryManager from '../../testing/mocking/mockQueryManager';
-import mockWatchQuery from '../../testing/mocking/mockWatchQuery';
-import wrap from '../../testing/wrap';
+import mockQueryManager from '../../testing/core/mocking/mockQueryManager';
+import mockWatchQuery from '../../testing/core/mocking/mockWatchQuery';
+import wrap from '../../testing/core/wrap';
 
 export const mockFetchQuery = (queryManager: QueryManager<any>) => {
   const fetchQueryObservable = queryManager.fetchQueryObservable;

src/core/__tests__/QueryManager/index.ts

@@ -15,9 +15,9 @@ import {
 } from '../../../cache/inmemory/types';
 
 // mocks
-import mockQueryManager from '../../../testing/mocking/mockQueryManager';
-import mockWatchQuery from '../../../testing/mocking/mockWatchQuery';
-import { MockApolloLink, mockSingleLink } from '../../../testing/mocking/mockLink';
+import mockQueryManager from '../../../testing/core/mocking/mockQueryManager';
+import mockWatchQuery from '../../../testing/core/mocking/mockWatchQuery';
+import { MockApolloLink, mockSingleLink } from '../../../testing/core/mocking/mockLink';
 
 // core
 import { ApolloQueryResult } from '../../types';
@@ -29,12 +29,11 @@ import { QueryManager } from '../../QueryManager';
 import { ApolloError } from '../../../errors';
 
 // testing utils
-import wrap from '../../../testing/wrap';
+import wrap from '../../../testing/core/wrap';
 import observableToPromise, {
   observableToPromiseAndSubscription,
-} from '../../../testing/observableToPromise';
-import subscribeAndCount from '../../../testing/subscribeAndCount';
-import { itAsync } from '../../../testing/itAsync';
+} from '../../../testing/core/observableToPromise';
+import { itAsync, subscribeAndCount } from '../../../testing/core';
 import { ApolloClient } from '../../../core'
 import { mockFetchQuery } from '../ObservableQuery';
 

src/core/__tests__/QueryManager/links.ts

@@ -6,7 +6,7 @@ import { ApolloLink } from '../../../link/core';
 import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
 
 // mocks
-import { MockSubscriptionLink } from '../../../testing/mocking/mockSubscriptionLink';
+import { MockSubscriptionLink } from '../../../testing/core';
 
 // core
 import { QueryManager } from '../../QueryManager';

src/core/__tests__/QueryManager/multiple-results.ts

@@ -3,9 +3,7 @@ import gql from 'graphql-tag';
 import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
 
 // mocks
-import {
-  MockSubscriptionLink
-} from '../../../testing/mocking/mockSubscriptionLink';
+import { MockSubscriptionLink } from '../../../testing/core';
 
 // core
 import { QueryManager } from '../../QueryManager';

src/core/__tests__/QueryManager/recycler.ts

@@ -6,15 +6,15 @@
 
 // externals
 import gql from 'graphql-tag';
-import { InMemoryCache } from '../../../cache/inmemory/inMemoryCache';
-import {
-  MockSubscriptionLink
-} from '../../../testing/mocking/mockSubscriptionLink';
 
 // core
 import { QueryManager } from '../../QueryManager';
 import { ObservableQuery } from '../../ObservableQuery';
 import { ObservableSubscription } from '../../../utilities';
+import { InMemoryCache } from '../../../cache';
+
+// mocks
+import { MockSubscriptionLink } from '../../../testing/core';
 
 describe('Subscription lifecycles', () => {
   it('cleans up and reuses data like QueryRecycler wants', done => {

src/react/hoc/__tests__/mutations/lifecycle.test.tsx

@@ -3,7 +3,7 @@ import { render, cleanup } from '@testing-library/react';
 import gql from 'graphql-tag';
 
 import { ApolloProvider } from '../../../context/ApolloProvider';
-import { createMockClient } from '../../../../testing/mocking/mockClient';
+import { createMockClient } from '../../../../testing/core';
 import { graphql } from '../../graphql';
 import { ChildProps } from '../../types';
 

src/testing/core/index.ts

@@ -0,0 +1,14 @@
+export {
+  MockLink,
+  mockSingleLink,
+  MockedResponse,
+  ResultFunction
+} from './mocking/mockLink';
+export {
+  MockSubscriptionLink,
+  mockObservableLink
+} from './mocking/mockSubscriptionLink';
+export { createMockClient } from './mocking/mockClient';
+export { default as subscribeAndCount } from './subscribeAndCount';
+export { itAsync } from './itAsync';
+export * from './withConsoleSpy';

src/testing/mocking/mockClient.ts → src/testing/core/mocking/mockClient.ts

@@ -1,7 +1,7 @@
 import { DocumentNode } from 'graphql';
 
-import { ApolloClient } from '../../core';
-import { InMemoryCache, NormalizedCacheObject } from '../../cache';
+import { ApolloClient } from '../../../core';
+import { InMemoryCache, NormalizedCacheObject } from '../../../cache';
 import { mockSingleLink } from './mockLink';
 
 export function createMockClient<TData>(

src/testing/mocking/mockLink.ts → src/testing/core/mocking/mockLink.ts

@@ -1,4 +1,4 @@
-import { invariant } from '../../utilities/globals';
+import { invariant } from '../../../utilities/globals';
 
 import { print } from 'graphql';
 import { equal } from '@wry/equality';
@@ -8,7 +8,7 @@ import {
   Operation,
   GraphQLRequest,
   FetchResult,
-} from '../../link/core';
+} from '../../../link/core';
 
 import {
   Observable,
@@ -17,7 +17,7 @@ import {
   removeConnectionDirectiveFromDocument,
   cloneDeep,
   stringifyForDisplay,
-} from '../../utilities';
+} from '../../../utilities';
 
 export type ResultFunction<T> = () => T;
 

src/testing/mocking/mockQueryManager.ts → src/testing/core/mocking/mockQueryManager.ts

@@ -1,6 +1,6 @@
-import { QueryManager } from '../../core/QueryManager';
+import { QueryManager } from '../../../core/QueryManager';
 import { mockSingleLink, MockedResponse } from './mockLink';
-import { InMemoryCache } from '../../cache';
+import { InMemoryCache } from '../../../cache';
 
 // Helper method for the tests that construct a query manager out of a
 // a list of mocked responses for a mocked network interface.

src/testing/mocking/mockSubscriptionLink.ts → src/testing/core/mocking/mockSubscriptionLink.ts

@@ -1,5 +1,5 @@
-import { Observable } from '../../utilities';
-import { ApolloLink, FetchResult, Operation } from '../../link/core';
+import { Observable } from '../../../utilities';
+import { ApolloLink, FetchResult, Operation } from '../../../link/core';
 
 export interface MockedSubscription {
   request: Operation;

src/testing/mocking/mockWatchQuery.ts → src/testing/core/mocking/mockWatchQuery.ts

@@ -1,6 +1,6 @@
 import { MockedResponse } from './mockLink';
 import mockQueryManager from './mockQueryManager';
-import { ObservableQuery } from '../../core';
+import { ObservableQuery } from '../../../core';
 
 export default (
   reject: (reason: any) => any,

src/testing/observableToPromise.ts → src/testing/core/observableToPromise.ts

@@ -1,5 +1,5 @@
-import { ObservableQuery, ApolloQueryResult } from '../core';
-import { ObservableSubscription } from '../utilities';
+import { ObservableQuery, ApolloQueryResult } from '../../core';
+import { ObservableSubscription } from '../../utilities';
 
 /**
  *

src/testing/subscribeAndCount.ts → src/testing/core/subscribeAndCount.ts

@@ -1,5 +1,5 @@
-import { ObservableQuery, ApolloQueryResult, OperationVariables } from '../core';
-import { ObservableSubscription, asyncMap } from '../utilities';
+import { ObservableQuery, ApolloQueryResult, OperationVariables } from '../../core';
+import { ObservableSubscription, asyncMap } from '../../utilities';
 
 export default function subscribeAndCount<
   TData,

src/testing/index.ts

@@ -1,16 +1,3 @@
 import '../utilities/globals';
-export { MockedProvider, MockedProviderProps } from './mocking/MockedProvider';
-export {
-  MockLink,
-  mockSingleLink,
-  MockedResponse,
-  ResultFunction
-} from './mocking/mockLink';
-export {
-  MockSubscriptionLink,
-  mockObservableLink
-} from './mocking/mockSubscriptionLink';
-export { createMockClient } from './mocking/mockClient';
-export { default as subscribeAndCount } from './subscribeAndCount';
-export { itAsync } from './itAsync';
-export * from './withConsoleSpy';
+export { MockedProvider, MockedProviderProps } from './react/MockedProvider';
+export * from './core';

src/testing/mocking/MockedProvider.tsx → src/testing/react/MockedProvider.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { ApolloClient, DefaultOptions } from '../../core';
 import { InMemoryCache as Cache } from '../../cache';
 import { ApolloProvider } from '../../react/context';
-import { MockLink, MockedResponse } from './mockLink';
+import { MockLink, MockedResponse } from '../core';
 import { ApolloLink } from '../../link/core';
 import { Resolvers } from '../../core';
 import { ApolloCache } from '../../cache';

src/testing/mocking/__tests__/MockedProvider.test.tsx → src/testing/react/__tests__/MockedProvider.test.tsx

@@ -1,11 +1,10 @@
 import React from 'react';
+import { DocumentNode } from 'graphql';
 import { render, wait } from '@testing-library/react';
 import gql from 'graphql-tag';
 
-import { itAsync } from '../../itAsync';
+import { itAsync, MockedResponse, MockLink } from '../../core';
 import { MockedProvider } from '../MockedProvider';
-import { MockedResponse, MockLink } from '../mockLink';
-import { DocumentNode } from 'graphql';
 import { useQuery } from '../../../react/hooks';
 import { InMemoryCache } from '../../../cache';
 import { ApolloLink } from '../../../link/core';

src/testing/mocking/__tests__/mockSubscriptionLink.test.tsx → src/testing/react/__tests__/mockSubscriptionLink.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, wait } from '@testing-library/react';
 import gql from 'graphql-tag';
 
-import { MockSubscriptionLink } from '../mockSubscriptionLink';
+import { MockSubscriptionLink } from '../../core';
 import { ApolloClient } from '../../../core';
 import { InMemoryCache as Cache } from '../../../cache';
 import { ApolloProvider } from '../../../react/context';