From 787846c64b703699cbe4918c698a20371e7ca0a9 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Thu, 11 Oct 2018 14:43:29 +0200
Subject: [PATCH] Fix `apollo-server-env` mock

---
 __mocks__/apollo-server-env.ts                   | 12 ++++++------
 packages/apollo-datasource-rest/src/HTTPCache.ts |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/__mocks__/apollo-server-env.ts b/__mocks__/apollo-server-env.ts
index 37c34794..5751b938 100644
--- a/__mocks__/apollo-server-env.ts
+++ b/__mocks__/apollo-server-env.ts
@@ -46,16 +46,16 @@ mockFetch.mockJSONResponseOnce = (
   );
 };
 
-export {
-  mockFetch as fetch,
+const env = {
+  fetch: mockFetch,
   Request,
-  RequestInit,
   Response,
   Body,
-  BodyInit,
   Headers,
-  HeadersInit,
   URL,
   URLSearchParams,
-  URLSearchParamsInit,
 };
+
+jest.doMock('apollo-server-env', () => env);
+
+export = env;
diff --git a/packages/apollo-datasource-rest/src/HTTPCache.ts b/packages/apollo-datasource-rest/src/HTTPCache.ts
index 1b7da5e3..3d17d246 100644
--- a/packages/apollo-datasource-rest/src/HTTPCache.ts
+++ b/packages/apollo-datasource-rest/src/HTTPCache.ts
@@ -160,7 +160,7 @@ function policyResponseFrom(response: Response) {
 
 function headersToObject(headers: Headers) {
   const object = Object.create(null);
-  for (const [name, value] of headers as Headers) {
+  for (const [name, value] of headers) {
     object[name] = value;
   }
   return object;