Applied suggestions from PR#104

inrupt · Jun 2, 2020 · eb29a5f · eb29a5f
1 parent 07d093b
commit eb29a5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/nonRdfData.test.ts b/src/nonRdfData.test.ts
@@ -5,6 +5,8 @@ import { Headers, Response } from "cross-fetch";
 
 describe("Non-RDF data fetch", () => {
   it("should GET a remote resource using cross-fetch if no other fetcher is available", async () => {
+    // Mocking cross-fetch must not happen in the global scope, otherwise it
+    // breaks the imports of the Headers and Response classes.
     jest.mock("cross-fetch");
     const crossFetch = jest.requireMock("cross-fetch") as jest.Mock<
       ReturnType<typeof window.fetch>,
@@ -22,7 +24,7 @@ describe("Non-RDF data fetch", () => {
       [
         "https://some.url",
         {
-          headers: new Headers({}),
+          headers: {},
         },
       ],
     ]);
@@ -43,7 +45,7 @@ describe("Non-RDF data fetch", () => {
       [
         "https://some.url",
         {
-          headers: new Headers({}),
+          headers: {},
         },
       ],
     ]);

diff --git a/src/nonRdfData.ts b/src/nonRdfData.ts
@@ -1,12 +1,12 @@
 import { fetch } from "./fetcher";
 import { IriString } from "./index";
-import { Headers } from "cross-fetch";
 
-/**
- * @internal
- */
-const defaultFetchOptions = {
-  headers: new Headers({}),
+interface GetFileOptions {
+  fetch: typeof window.fetch;
+  headers: RequestInit["headers"];
+}
+const defaultGetFileOptions = {
+  headers: {},
   fetch: fetch,
 };
 
@@ -18,10 +18,10 @@ const defaultFetchOptions = {
  */
 export async function getFile(
   url: IriString,
-  options: Partial<typeof defaultFetchOptions> = defaultFetchOptions
+  options: Partial<GetFileOptions> = defaultGetFileOptions
 ): Promise<Blob> {
   const config = {
-    ...defaultFetchOptions,
+    ...defaultGetFileOptions,
     ...options,
   };
   const response = await config.fetch(url, { headers: config.headers });