fixed two queries in flight bug for Apollo Link

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### vNEXT
 
+-fixed `resolved` scoping issue for multiple queries in flight with Apollo Link [PR #2002](https://github.com/apollographql/apollo-client/pull/2002)
+
 ### 1.9.0
 - Move to `apollo-link-core` from `apollo-link` to reduce bundle size [PR #1955](https://github.com/apollographql/apollo-client/pull/1955)
 - Document ApolloClient.prototype.subscribe [PR #1932](https://github.com/apollographql/apollo-client/pull/1932)

src/ApolloClient.ts

@@ -207,9 +207,9 @@ export default class ApolloClient implements DataProxy {
     const createQuery = (
       getResult: (request: Request) => Observable<ExecutionResult>,
     ) => {
-      let resolved = false;
       return (request: Request) =>
         new Promise<ExecutionResult>((resolve, reject) => {
+          let resolved = false;
           const subscription = getResult(request).subscribe({
             next: (data: ExecutionResult) => {
               if (!resolved) {

test/client.ts

@@ -315,6 +315,87 @@ describe('client', () => {
     });
   });
 
+  it(
+    'should allow multiple queries with an apollo-link enabled network interface',
+    done => {
+      const query = gql`
+        query people {
+          allPeople(first: 1) {
+            people {
+              name
+              __typename
+            }
+            __typename
+          }
+        }
+      `;
+
+      const query2 = gql`
+        query people {
+          people {
+            id
+          }
+        }
+      `;
+
+      const data = {
+        allPeople: {
+          people: [
+            {
+              name: 'Luke Skywalker',
+              __typename: 'Person',
+            },
+          ],
+          __typename: 'People',
+        },
+      };
+
+      const data2 = {
+        people: {
+          id: 'People',
+        },
+      };
+
+      const variables = { first: 1 };
+
+      const networkInterface = ApolloLink.from([
+        operation => {
+          if (operation.query === query) {
+            return Observable.of({
+              data,
+            });
+          } else {
+            return Observable.of({
+              data: data2,
+            });
+          }
+        },
+      ]);
+
+      const client = new ApolloClient({
+        networkInterface,
+        addTypename: false,
+      });
+
+      let done1 = false,
+        done2 = false;
+      client.query({ query, variables }).then(actualResult => {
+        assert.deepEqual(actualResult.data, data);
+        done1 = true;
+        if (done2) {
+          done();
+        }
+      });
+      client.query({ query: query2, variables }).then(actualResult2 => {
+        assert.deepEqual(actualResult2.data, data2);
+        done2 = true;
+        if (done1) {
+          done();
+        }
+      });
+    },
+  );
+
   it('should allow for a single query with complex default variables to take place', () => {
     const query = gql`
       query stuff(