use response.json

dotansimha · Sep 6, 2022 · b8fe823 · b8fe823
1 parent 7277722
commit b8fe823
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 40 deletions.
diff --git a/examples/node-esm/__integration-tests__/esm.spec.mjs b/examples/node-esm/__integration-tests__/esm.spec.mjs
@@ -12,7 +12,7 @@ describe('Node ESM', () => {
       }),
     })
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data.greetings).toBe('Hello world!')
   })
 })
diff --git a/packages/graphql-yoga/__integration-tests__/node-http.spec.ts b/packages/graphql-yoga/__integration-tests__/node-http.spec.ts
@@ -31,7 +31,7 @@ it('should expose Node req and res objects in the context', async () => {
       `http://localhost:${port}/graphql?query=query{isNode}`,
     )
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.isNode).toBe(true)
   } finally {

diff --git a/packages/graphql-yoga/__tests__/error-masking.spec.ts b/packages/graphql-yoga/__tests__/error-masking.spec.ts
@@ -38,7 +38,7 @@ describe('error masking', () => {
       body: JSON.stringify({ query: '{ hi hello }' }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data.hi).toBeNull()
     expect(body.errors![0].message).toBe('Unexpected error.')
     expect(body.data.hello).toBeNull()
@@ -57,7 +57,7 @@ describe('error masking', () => {
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ query: '{ hi hello }' }),
     })
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
 
     expect(body.data.hi).toBeNull()
     expect(body.errors![0].message).toBe('Hahahaha')
@@ -77,7 +77,7 @@ describe('error masking', () => {
       body: JSON.stringify({ query: '{ hi hello }' }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data.hi).toBeNull()
     expect(body.errors![0].message).toBe('Unexpected error.')
     expect(body.data.hello).toBeNull()
@@ -99,7 +99,7 @@ describe('error masking', () => {
       body: JSON.stringify({ query: '{ hi hello }' }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data.hi).toBeNull()
     expect(body.errors?.[0]?.message).toBe('Unexpected error.')
     expect(body.errors?.[0]?.extensions).toStrictEqual({
@@ -129,7 +129,7 @@ describe('error masking', () => {
         body: JSON.stringify({ query: '{ hi hello }' }),
       })
 
-      const body = JSON.parse(await response.text())
+      const body = await response.json()
       expect(body.data.hi).toBeNull()
       expect(body.errors?.[0]?.message).toBe('Unexpected error.')
       expect(body.errors?.[0]?.extensions).toStrictEqual({
@@ -165,7 +165,7 @@ describe('error masking', () => {
 
     expect(response.status).toBe(500)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors?.[0]?.message).toBe('Unexpected error.')
   })
 
@@ -184,7 +184,7 @@ describe('error masking', () => {
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ query: '{ __typename }' }),
     })
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body).toMatchInlineSnapshot(`
       Object {
         "errors": Array [
@@ -210,7 +210,7 @@ describe('error masking', () => {
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ query: '{ __typename }' }),
     })
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body).toMatchInlineSnapshot(`
       Object {
         "errors": Array [
@@ -236,7 +236,7 @@ describe('error masking', () => {
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ query: '{ __typename }' }),
     })
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body).toMatchInlineSnapshot(`
       Object {
         "errors": Array [
@@ -272,7 +272,7 @@ describe('error masking', () => {
       headers: { 'content-type': 'application/json' },
       body: JSON.stringify({ query: '{ greetings }' }),
     })
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body).toMatchInlineSnapshot(`
       Object {
         "errors": Array [
@@ -309,7 +309,7 @@ describe('error masking', () => {
     })
 
     expect(response.status).toEqual(400)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
 
     expect(body).toMatchInlineSnapshot(`
       Object {
@@ -349,7 +349,7 @@ describe('error masking', () => {
     })
 
     expect(response.status).toEqual(400)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
 
     expect(body).toMatchInlineSnapshot(`
       Object {
@@ -393,7 +393,7 @@ describe('error masking', () => {
       body: JSON.stringify({ query: '{a}' }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body).toStrictEqual({
       errors: [
         {

diff --git a/packages/graphql-yoga/__tests__/http-extensions.spec.ts b/packages/graphql-yoga/__tests__/http-extensions.spec.ts
@@ -82,7 +82,7 @@ describe('GraphQLError.extensions.http', () => {
 
     expect(response.status).toBe(503)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body).toMatchObject({
       data: {
         a: null,

diff --git a/packages/graphql-yoga/__tests__/introspection.spec.ts b/packages/graphql-yoga/__tests__/introspection.spec.ts
@@ -33,7 +33,7 @@ describe('introspection', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data?.__schema.queryType.name).toBe('Query')
   })

diff --git a/packages/graphql-yoga/__tests__/requests.spec.ts b/packages/graphql-yoga/__tests__/requests.spec.ts
@@ -43,7 +43,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.ping).toBe('pong')
   })
@@ -57,7 +57,7 @@ describe('requests', () => {
     )
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.ping).toBe('pong')
   })
@@ -75,7 +75,7 @@ describe('requests', () => {
     expect(response.status).toBe(405)
 
     expect(response.headers.get('allow')).toEqual('POST')
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
 
     expect(body.data).toBeUndefined()
     expect(body.errors).toHaveLength(1)
@@ -98,7 +98,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.echo).toBe(null)
   })
@@ -118,7 +118,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.echo).toBe('hello')
   })
@@ -131,7 +131,7 @@ describe('requests', () => {
     })
     expect(response.status).toBe(400)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
 
     expect(body.errors).toBeDefined()
     expect(body.data).toBeUndefined()
@@ -145,7 +145,7 @@ describe('requests', () => {
     })
     expect(response.status).toBe(400)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeDefined()
     expect(body.errors[0].message).toEqual('POST body sent invalid JSON.')
 
@@ -161,7 +161,7 @@ describe('requests', () => {
 
     expect(response.status).toBe(400)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
 
     expect(body.errors).toBeDefined()
     expect(body.data).toBeUndefined()
@@ -176,7 +176,7 @@ describe('requests', () => {
 
     expect(response.status).toBe(400)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data).toBeUndefined()
     expect(body.errors?.[0].message).toBe('Must provide query string.')
   })
@@ -190,7 +190,7 @@ describe('requests', () => {
 
     expect(response.status).toBe(400)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data).toBeUndefined()
     expect(body.errors?.[0].message).toBe(
       'Expected "query" param to be a string, but given object.',
@@ -224,7 +224,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.ping).toBe('pong')
   })
@@ -239,7 +239,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.ping).toBe('pong')
   })
@@ -254,7 +254,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(200)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.ping).toBe('pong')
   })
@@ -269,7 +269,7 @@ describe('requests', () => {
     })
 
     expect(response.status).toBe(400)
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.data).toBeUndefined()
     expect(body.errors?.[0].message).toBe(
       'Unexpected parameter "test" in the request body.',

diff --git a/packages/plugins/apq/__tests__/apq.spec.ts b/packages/plugins/apq/__tests__/apq.spec.ts
@@ -36,7 +36,7 @@ describe('Automatic Persisted Queries', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeDefined()
     expect(body.errors[0].message).toBe('PersistedQueryNotFound')
   })
@@ -68,7 +68,7 @@ describe('Automatic Persisted Queries', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.__typename).toBe('Query')
   })
@@ -106,7 +106,7 @@ describe('Automatic Persisted Queries', () => {
     const entry = store.get(persistedQueryEntry.sha256Hash)
     expect(entry).toBe(query)
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.__typename).toBe('Query')
   })
@@ -138,7 +138,7 @@ describe('Automatic Persisted Queries', () => {
     })
 
     expect(response.status).toEqual(500)
-    expect(JSON.parse(await response.text())).toEqual({
+    expect(await response.json()).toEqual({
       errors: [{ message: 'PersistedQueryMismatch' }],
     })
   })

diff --git a/packages/plugins/persisted-operations/__tests__/persisted-operations.spec.ts b/packages/plugins/persisted-operations/__tests__/persisted-operations.spec.ts
@@ -38,7 +38,7 @@ describe('Persisted Operations', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeDefined()
     expect(body.errors[0].message).toBe('PersistedQueryNotFound')
   })
@@ -75,7 +75,7 @@ describe('Persisted Operations', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data.__typename).toBe('Query')
   })
@@ -110,7 +110,7 @@ describe('Persisted Operations', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeDefined()
     expect(body.errors[0].message).toBe('PersistedQueryOnly')
   })
@@ -145,7 +145,7 @@ describe('Persisted Operations', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data).toEqual({ __typename: 'Query' })
   })
@@ -182,7 +182,7 @@ describe('Persisted Operations', () => {
       }),
     })
 
-    const body = JSON.parse(await response.text())
+    const body = await response.json()
     expect(body.errors).toBeUndefined()
     expect(body.data).toEqual({ __typename: 'Query' })
   })