Simplified the MockedProvider

Changelog.md

@@ -2,6 +2,8 @@
 
 ### vNext
 
+* Simplified the MockedProvider API [#1882](https://github.com/apollographql/react-apollo/pull/1882)
+
 ### 2.1.1
 
 * Fix uneccesary rerender on cache hit

src/test-utils.tsx

@@ -11,22 +11,16 @@ export class MockedProvider extends React.Component<any, any> {
 
   constructor(props: any, context: any) {
     super(props, context);
-    if (this.props.client) return;
 
-    const addTypename = !this.props.removeTypename;
     const link = mockSingleLink.apply(null, this.props.mocks);
     this.client = new ApolloClient({
       link,
-      cache: new Cache({ addTypename }),
+      cache: new Cache({ addTypename: false }),
       defaultOptions: this.props.defaultOptions,
     });
   }
 
   render() {
-    return (
-      <ApolloProvider client={this.client || this.props.client}>
-        {this.props.children}
-      </ApolloProvider>
-    );
+    return <ApolloProvider client={this.client}>{this.props.children}</ApolloProvider>;
   }
 }

test/__snapshots__/test-utils.test.tsx.snap

@@ -1,34 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`allows for passing a custom client 1`] = `
+exports[`allows for querying with the typename 1`] = `
 Object {
   "__typename": "User",
   "id": "user_id",
   Symbol(id): "User:user_id",
 }
 `;
 
-exports[`errors if the variables in the mock and component do not match 1`] = `
+exports[`errors if the query in the mock and component do not match 1`] = `
 [Error: Network error: No more mocked responses for the query: query GetUser($username: String!) {
   user(username: $username) {
     id
-    __typename
   }
 }
-, variables: {"username":"other_user"}]
+, variables: {"username":"mock_username"}]
 `;
 
-exports[`mocks the data and adds the typename to the query 1`] = `
-Object {
-  "__typename": "User",
-  "id": "user_id",
-  Symbol(id): "User:user_id",
+exports[`errors if the variables in the mock and component do not match 1`] = `
+[Error: Network error: No more mocked responses for the query: query GetUser($username: String!) {
+  user(username: $username) {
+    id
+  }
 }
+, variables: {"username":"other_user"}]
 `;
 
-exports[`mocks the data without adding the typename 1`] = `
+exports[`mocks the data 1`] = `
 Object {
   "id": "user_id",
-  Symbol(id): "$ROOT_QUERY.user({\\"username\\":\\"mock_username\\"})",
+  Symbol(id): "User:user_id",
 }
 `;

test/client/Query.test.tsx

@@ -91,7 +91,7 @@ describe('Query component', () => {
     const Component = () => <Query query={allPeopleQuery}>{_ => <div />}</Query>;
 
     wrapper = mount(
-      <MockedProvider mocks={allPeopleMocks} removeTypename>
+      <MockedProvider mocks={allPeopleMocks}>
         <Component />
       </MockedProvider>,
     );
@@ -142,7 +142,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocksWithVariable} removeTypename>
+        <MockedProvider mocks={mocksWithVariable}>
           <Component />
         </MockedProvider>,
       );
@@ -172,7 +172,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mockError} removeTypename>
+        <MockedProvider mocks={mockError}>
           <Component />
         </MockedProvider>,
       );
@@ -271,7 +271,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -341,7 +341,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -403,7 +403,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -462,7 +462,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -524,7 +524,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -547,7 +547,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={allPeopleMocks} removeTypename>
+        <MockedProvider mocks={allPeopleMocks}>
           <Component />
         </MockedProvider>,
       );
@@ -571,7 +571,6 @@ describe('Query component', () => {
         <MockedProvider
           defaultOptions={{ watchQuery: { fetchPolicy: 'cache-only' } }}
           mocks={allPeopleMocks}
-          removeTypename
         >
           <Component />
         </MockedProvider>,
@@ -624,7 +623,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -677,7 +676,7 @@ describe('Query component', () => {
       );
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -814,7 +813,7 @@ describe('Query component', () => {
       }
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -883,7 +882,7 @@ describe('Query component', () => {
       }
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -1018,7 +1017,7 @@ describe('Query component', () => {
       }
 
       wrapper = mount(
-        <MockedProvider mocks={mocks} removeTypename>
+        <MockedProvider mocks={mocks}>
           <Component />
         </MockedProvider>,
       );
@@ -1069,7 +1068,7 @@ describe('Query component', () => {
     }
 
     wrapper = mount(
-      <MockedProvider mocks={allPeopleMocks} removeTypename>
+      <MockedProvider mocks={allPeopleMocks}>
         <Component />
       </MockedProvider>,
     );