Remove redundant response.headers check

urql-graphql · Mar 14, 2023 · fb671e3 · fb671e3
1 parent a1ddb49
commit fb671e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/packages/core/src/exchanges/fetch.test.ts b/packages/core/src/exchanges/fetch.test.ts
@@ -62,6 +62,7 @@ describe('on success', () => {
   beforeEach(() => {
     fetch.mockResolvedValue({
       status: 200,
+      headers: { get: () => 'application/json' },
       text: vi.fn().mockResolvedValue(response),
     });
   });
@@ -91,6 +92,7 @@ describe('on error', () => {
   beforeEach(() => {
     fetch.mockResolvedValue({
       status: 400,
+      headers: { get: () => 'application/json' },
       text: vi.fn().mockResolvedValue(JSON.stringify({})),
     });
   });
@@ -126,6 +128,7 @@ describe('on error', () => {
   it('ignores the error when a result is available', async () => {
     fetch.mockResolvedValue({
       status: 400,
+      headers: { get: () => 'application/json' },
       text: vi.fn().mockResolvedValue(response),
     });
 

diff --git a/packages/core/src/internal/__snapshots__/fetchSource.test.ts.snap b/packages/core/src/internal/__snapshots__/fetchSource.test.ts.snap
@@ -606,6 +606,9 @@ exports[`on success > uses the mock fetch if given 1`] = `
           {
             "type": "return",
             "value": {
+              "headers": {
+                "get": [Function],
+              },
               "status": 200,
               "text": [MockFunction spy] {
                 "calls": [

diff --git a/packages/core/src/internal/fetchSource.test.ts b/packages/core/src/internal/fetchSource.test.ts
@@ -48,6 +48,7 @@ describe('on success', () => {
   beforeEach(() => {
     fetch.mockResolvedValue({
       status: 200,
+      headers: { get: () => 'application/json' },
       text: vi.fn().mockResolvedValue(response),
     });
   });
@@ -70,6 +71,7 @@ describe('on success', () => {
     const fetchOptions = {};
     const fetcher = vi.fn().mockResolvedValue({
       status: 200,
+      headers: { get: () => 'application/json' },
       text: vi.fn().mockResolvedValue(response),
     });
 
@@ -99,6 +101,7 @@ describe('on error', () => {
     fetch.mockResolvedValue({
       status: 400,
       statusText: 'Forbidden',
+      headers: { get: () => 'application/json' },
       text: vi.fn().mockResolvedValue('{}'),
     });
   });

diff --git a/packages/core/src/internal/fetchSource.ts b/packages/core/src/internal/fetchSource.ts
@@ -46,8 +46,7 @@ async function* fetchOperation(
     // if a teardown comes in immediately
     await Promise.resolve();
     response = await (operation.context.fetch || fetch)(url, fetchOptions);
-    const contentType =
-      (response.headers && response.headers.get('Content-Type')) || '';
+    const contentType = response.headers.get('Content-Type') || '';
     if (/text\//i.test(contentType)) {
       const text = await response.text();
       return yield makeErrorResult(operation, new Error(text), response);
@@ -87,8 +86,7 @@ async function* fetchOperation(
           } catch (_error) {}
 
           if (next.startsWith('--') || (payload && !payload.hasNext)) {
-            if (!result)
-              yield (result = makeResult(operation, {}, response));
+            if (!result) yield (result = makeResult(operation, {}, response));
             break chunks;
           }
         }
@@ -103,7 +101,8 @@ async function* fetchOperation(
 
     yield makeErrorResult(
       operation,
-      (response!.status < 200 || response!.status >= 300) && response!.statusText
+      (response!.status < 200 || response!.status >= 300) &&
+        response!.statusText
         ? new Error(response!.statusText)
         : error,
       response!