Add test to verify error is persisted on re-render, when appropriate

Changelog.md

@@ -19,6 +19,8 @@
   [@hwillson](https://github.com/hwillson) in [#3337](https://github.com/apollographql/react-apollo/pull/3337)
 - Add `@types/react` as a peer dep, to address potential TS compilation errors when using `ApolloProvider`. <br/>
   [@zkochan](https://github.com/zkochan) in [#3278](https://github.com/apollographql/react-apollo/pull/3278)
+- Make sure `error`'s are maintained after re-renders, when they should be. <br/>
+  [@hwillson](https://github.com/hwillson) in [#3362](https://github.com/apollographql/react-apollo/pull/3362)
 
 ## 3.0.0 (2019-08-06)
 

packages/hooks/src/__tests__/useQuery.test.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useReducer } from 'react';
 import { DocumentNode, GraphQLError } from 'graphql';
 import gql from 'graphql-tag';
 import { MockedProvider, MockLink } from '@apollo/react-testing';
@@ -319,5 +319,59 @@ describe('useQuery Hook', () => {
         </ApolloProvider>
       );
     });
+
+    it('should persist errors on re-render if they are still valid', done => {
+      const query = gql`
+        query SomeQuery {
+          stuff {
+            thing
+          }
+        }
+      `;
+
+      const mocks = [
+        {
+          request: { query },
+          result: {
+            errors: [new GraphQLError('forced error')]
+          }
+        }
+      ];
+
+      let renderCount = 0;
+      function App() {
+        const [_, forceUpdate] = useReducer(x => x + 1, 0);
+        const { loading, error } = useQuery(query);
+
+        switch (renderCount) {
+          case 0:
+            expect(loading).toBeTruthy();
+            expect(error).toBeUndefined();
+            break;
+          case 1:
+            expect(error).toBeDefined();
+            expect(error!.message).toEqual('GraphQL error: forced error');
+            setTimeout(() => {
+              forceUpdate(0);
+            });
+            break;
+          case 2:
+            expect(error).toBeDefined();
+            expect(error!.message).toEqual('GraphQL error: forced error');
+            done();
+            break;
+          default: // Do nothing
+        }
+
+        renderCount += 1;
+        return null;
+      }
+
+      render(
+        <MockedProvider mocks={mocks}>
+          <App />
+        </MockedProvider>
+      );
+    });
   });
 });