Removed the react-native test.

Changelog.md

@@ -30,6 +30,7 @@ first three params (`TChildProps` can be derived). [#1402](https://github.com/ap
   - Converted `test/test-utils/test-utils.test.js` to `test/test-utils.test.tsx` [#1475](https://github.com/apollographql/react-apollo/pull/1475)
   - Updates to `examples/typescript` [#1471](https://github.com/apollographql/react-apollo/pull/1471)
   - Mutation test cleanup [#1480](https://github.com/apollographql/react-apollo/pull/1480)
+  - Removed react-native from the test suite [#1451](https://github.com/apollographql/react-apollo/pull/1451)
 
 ### 2.0.4
 - rolled back on the lodash-es changes from

package.json

@@ -49,16 +49,14 @@
   ],
   "author": "James Baxley <[email protected]>",
   "babel": {
-    "presets": ["react-native"]
+    "presets": ["env"]
   },
   "jest": {
-    "preset": "react-native",
     "testEnvironment": "jsdom",
     "transform": {
       "^.+\\.tsx?$": "ts-jest",
       "^.+\\.jsx?$": "babel-jest"
     },
-    "transformIgnorePatterns": ["<rootDir>/node_modules/(?!(react-native)/)"],
     "mapCoverage": true,
     "moduleFileExtensions": ["ts", "tsx", "js", "json"],
     "modulePathIgnorePatterns": [
@@ -90,7 +88,6 @@
     "babel-core": "6.26.0",
     "babel-jest": "22.0.4",
     "babel-preset-env": "1.6.1",
-    "babel-preset-react-native": "4.0.0",
     "bundlesize": "0.15.3",
     "coveralls": "3.0.0",
     "danger": "2.1.6",
@@ -106,7 +103,6 @@
     "prettier": "1.9.2",
     "react": "16.2.0",
     "react-dom": "16.2.0",
-    "react-native": "0.51.0",
     "react-test-renderer": "16.2.0",
     "recompose": "0.26.0",
     "rimraf": "2.6.2",

test/client/Query.test.tsx

@@ -26,10 +26,17 @@ const allPeopleMocks = [
 ];
 
 describe('Query component', () => {
+  let wrapper;
   beforeEach(() => {
     jest.useRealTimers();
   });
 
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.unmount();
+      wrapper = null;
+    }
+  });
   it('calls the children prop', done => {
     const Component = () => (
       <Query query={allPeopleQuery}>
@@ -50,7 +57,7 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={allPeopleMocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -62,7 +69,7 @@ describe('Query component', () => {
       <Query query={allPeopleQuery}>{result => <div />}</Query>
     );
 
-    const wrapper = mount(
+    wrapper = mount(
       <MockedProvider mocks={allPeopleMocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -98,7 +105,7 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mockError} removeTypename>
         <Component />
       </MockedProvider>,
@@ -120,14 +127,28 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={allPeopleMocks} removeTypename>
         <Component />
       </MockedProvider>,
     );
   });
 
   it('sets the notifyOnNetworkStatusChange prop', done => {
+    const data1 = { allPeople: { people: [{ name: 'Luke Skywalker' }] } };
+    const data2 = { allPeople: { people: [{ name: 'Han Solo' }] } };
+
+    const mocks = [
+      {
+        request: { query: allPeopleQuery },
+        result: { data: data1 },
+      },
+      {
+        request: { query: allPeopleQuery },
+        result: { data: data2 },
+      },
+    ];
+
     let count = 0;
     expect.assertions(4);
     const Component = () => (
@@ -158,8 +179,8 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
-      <MockedProvider mocks={allPeopleMocks} removeTypename>
+    wrapper = mount(
+      <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
     );
@@ -190,30 +211,27 @@ describe('Query component', () => {
       },
     ];
 
-    const render = jest.fn(() => null);
-
     const variables = {
       first: 1,
     };
 
     const Component = () => (
       <Query query={queryWithVariables} variables={variables}>
-        {render}
+        {result => {
+          catchAsyncError(done, () => {
+            expect(result.variables).toEqual({ first: 1 });
+            done();
+          });
+          return null;
+        }}
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mocksWithVariable} removeTypename>
         <Component />
       </MockedProvider>,
     );
-
-    setTimeout(() => {
-      catchAsyncError(done, () => {
-        expect(render.mock.calls[0][0].variables).toEqual({ first: 1 });
-        done();
-      });
-    }, 0);
   });
 
   it('errors if a Mutation is provided in the query', () => {
@@ -318,6 +336,7 @@ describe('Query component', () => {
             count++;
             return null;
           }
+
           catchAsyncError(done, () => {
             if (count === 1) {
               // first data
@@ -365,7 +384,7 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -436,7 +455,7 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -489,7 +508,7 @@ describe('Query component', () => {
       },
     ];
 
-    const wrapper = mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -499,7 +518,6 @@ describe('Query component', () => {
 
     catchAsyncError(done, () => {
       expect(count).toBe(POLL_COUNT);
-      wrapper.unmount();
       done();
     });
   });
@@ -559,7 +577,7 @@ describe('Query component', () => {
       },
     ];
 
-    const wrapper = mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -569,7 +587,6 @@ describe('Query component', () => {
 
     catchAsyncError(done, () => {
       expect(count).toBe(POLL_COUNT);
-      wrapper.unmount();
       done();
     });
   });
@@ -619,7 +636,7 @@ describe('Query component', () => {
       },
     ];
 
-    const wrapper = mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -629,7 +646,6 @@ describe('Query component', () => {
 
     catchAsyncError(done, () => {
       expect(count).toBe(POLL_COUNT);
-      wrapper.unmount();
       done();
     });
   });
@@ -684,7 +700,7 @@ describe('Query component', () => {
       </Query>
     );
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -763,7 +779,7 @@ describe('Query component', () => {
       }
     }
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -836,7 +852,7 @@ describe('Query component', () => {
       }
     }
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={mocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -886,7 +902,7 @@ describe('Query component', () => {
       }
     }
 
-    mount(
+    wrapper = mount(
       <MockedProvider mocks={allPeopleMocks} removeTypename>
         <Component />
       </MockedProvider>,
@@ -952,6 +968,6 @@ describe('Query component', () => {
       }
     }
 
-    mount(<Component />);
+    wrapper = mount(<Component />);
   });
 });

test/client/graphql/queries/observableQuery.test.tsx

@@ -7,7 +7,6 @@ import { ApolloLink } from 'apollo-link';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
 import { mockSingleLink } from '../../../../src/test-utils';
 import { ApolloProvider, graphql } from '../../../../src';
-
 import stripSymbols from '../../../test-utils/stripSymbols';
 
 describe('[queries] observableQuery', () => {
@@ -217,59 +216,6 @@ describe('[queries] observableQuery', () => {
     expect(queryObservable1).toBe(queryObservable2);
   });
 
-  it('will refetch active `ObservableQuery`s when resetting the client store', () => {
-    const query = gql`
-      query people {
-        allPeople(first: 1) {
-          people {
-            name
-          }
-        }
-      }
-    `;
-    // const data = { allPeople: { people: [{ name: 'Luke Skywalker' }] } };
-    let called = 0;
-    const link = new ApolloLink((o, f) => {
-      called++;
-      return f(o);
-    }).concat(
-      mockSingleLink(
-        {
-          request: { query },
-          result: { data: { allPeople: null } },
-        },
-        {
-          request: { query },
-          result: { data: { allPeople: { people: null } } },
-        },
-      ),
-    );
-    const client = new ApolloClient({
-      link,
-      cache: new Cache({ addTypename: false }),
-    });
-
-    @graphql(query)
-    class Container extends React.Component<any, any> {
-      render() {
-        return null;
-      }
-    }
-
-    renderer.create(
-      <ApolloProvider client={client}>
-        <Container />
-      </ApolloProvider>,
-    );
-
-    const keys = Array.from((client.queryManager as any).queries.keys());
-    expect(keys).toEqual(['1']);
-    expect(called).toBe(1);
-    (client.resetStore() as Promise<null>).then(() => {
-      expect(called).toBe(2);
-    });
-  });
-
   it('will recycle `ObservableQuery`s when re-rendering a portion of the tree', done => {
     const query = gql`
       query people {