test: use response.json() over parsing response.body

Fdawgs · Mar 13, 2024 · 19979b3 · 19979b3
1 parent 9857259
commit 19979b3
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 63 deletions.
diff --git a/src/plugins/doc-to-txt/plugin.test.js b/src/plugins/doc-to-txt/plugin.test.js
@@ -123,7 +123,7 @@ describe("DOC-to-TXT conversion plugin", () => {
 				headers,
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Bad Request",
 				message: "Bad Request",
 				statusCode: 400,

diff --git a/src/plugins/docx-to-html/plugin.test.js b/src/plugins/docx-to-html/plugin.test.js
@@ -140,7 +140,7 @@ describe("DOCX-to-HTML conversion plugin", () => {
 				headers,
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Bad Request",
 				message: "Bad Request",
 				statusCode: 400,

diff --git a/src/plugins/embed-html-images/plugin.test.js b/src/plugins/embed-html-images/plugin.test.js
@@ -68,7 +68,7 @@ describe("Embed-HTML-Images plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			code: "ENOENT",
 			errno: expect.any(Number),
 			path: expect.any(String),

diff --git a/src/plugins/html-to-txt/plugin.test.js b/src/plugins/html-to-txt/plugin.test.js
@@ -63,7 +63,7 @@ describe("HTML-to-TXT conversion plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Bad Request",
 			statusCode: 400,

diff --git a/src/plugins/pdf-to-html/plugin.test.js b/src/plugins/pdf-to-html/plugin.test.js
@@ -82,7 +82,7 @@ describe("PDF-to-HTML conversion plugin", () => {
 			},
 		});
 
-		const { body, docLocation } = JSON.parse(response.body);
+		const { body, docLocation } = response.json();
 		const dom = new JSDOM(body);
 
 		expect(body).not.toMatch(artifacts);
@@ -141,7 +141,7 @@ describe("PDF-to-HTML conversion plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Bad Request",
 			statusCode: 400,
@@ -169,7 +169,7 @@ describe("PDF-to-HTML conversion plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Internal Server Error",
 			message: "test error",
 			statusCode: 500,

diff --git a/src/plugins/pdf-to-txt/plugin.test.js b/src/plugins/pdf-to-txt/plugin.test.js
@@ -77,7 +77,7 @@ describe("PDF-to-TXT conversion plugin", () => {
 			},
 		});
 
-		const { body } = JSON.parse(response.body);
+		const { body } = response.json();
 
 		expect(body).toMatch("The NHS belongs to the people");
 		expect(isHtml(body)).toBe(false);
@@ -114,7 +114,7 @@ describe("PDF-to-TXT conversion plugin", () => {
 			},
 		});
 
-		const { body, docLocation } = JSON.parse(response.body);
+		const { body, docLocation } = response.json();
 
 		expect(body).toMatch("The NHS belongs to the people");
 		// String found at end of second page
@@ -149,7 +149,7 @@ describe("PDF-to-TXT conversion plugin", () => {
 			},
 		});
 
-		const { body } = JSON.parse(response.body);
+		const { body } = response.json();
 		const dom = new JSDOM(body);
 
 		expect(isHtml(body)).toBe(true);
@@ -205,7 +205,7 @@ describe("PDF-to-TXT conversion plugin", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Bad Request",
 				message: "Bad Request",
 				statusCode: 400,
@@ -249,7 +249,7 @@ describe("PDF-to-TXT conversion plugin", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Internal Server Error",
 				message: "test error",
 				statusCode: 500,

diff --git a/src/plugins/rtf-to-html/plugin.test.js b/src/plugins/rtf-to-html/plugin.test.js
@@ -64,7 +64,7 @@ describe("RTF-to-HTML conversion plugin", () => {
 			},
 		});
 
-		const { body, docLocation } = JSON.parse(response.body);
+		const { body, docLocation } = response.json();
 		const dom = new JSDOM(body);
 
 		expect(body).not.toMatch(artifacts);
@@ -129,7 +129,7 @@ describe("RTF-to-HTML conversion plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Bad Request",
 			statusCode: 400,
@@ -151,7 +151,7 @@ describe("RTF-to-HTML conversion plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Internal Server Error",
 			message: "test error",
 			statusCode: 500,

diff --git a/src/plugins/tidy-html/plugin.test.js b/src/plugins/tidy-html/plugin.test.js
@@ -106,7 +106,7 @@ describe("Tidy-HTML plugin", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			statusCode: 400,
 			error: "Bad Request",
 			message: "querystring.language not a valid IANA language tag",

diff --git a/src/routes/admin/healthcheck/route.test.js b/src/routes/admin/healthcheck/route.test.js
@@ -49,7 +49,7 @@ describe("Healthcheck route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Not Acceptable",
 				message: "Not Acceptable",
 				statusCode: 406,

diff --git a/src/routes/doc/txt/route.test.js b/src/routes/doc/txt/route.test.js
@@ -66,7 +66,7 @@ describe("DOC-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Body cannot be empty",
 			statusCode: 400,
@@ -100,7 +100,7 @@ describe("DOC-to-TXT route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Unsupported Media Type",
 				message: "Unsupported Media Type",
 				statusCode: 415,
@@ -122,7 +122,7 @@ describe("DOC-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Unsupported Media Type",
 			message: "Unsupported Media Type: application/html",
 			statusCode: 415,
@@ -141,7 +141,7 @@ describe("DOC-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Not Acceptable",
 			message: "Not Acceptable",
 			statusCode: 406,

diff --git a/src/routes/docs/openapi/route.test.js b/src/routes/docs/openapi/route.test.js
@@ -38,7 +38,7 @@ describe("OpenAPI route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toHaveProperty("openapi");
+			expect(response.json()).toHaveProperty("openapi");
 			expect(response.headers).toMatchObject({
 				"cache-control": "public, max-age=1800",
 			});
@@ -54,7 +54,7 @@ describe("OpenAPI route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Not Acceptable",
 				message: "Not Acceptable",
 				statusCode: 406,

diff --git a/src/routes/docs/route.test.js b/src/routes/docs/route.test.js
@@ -53,7 +53,7 @@ describe("Docs route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Not Acceptable",
 				message: "Not Acceptable",
 				statusCode: 406,

diff --git a/src/routes/docx/html/route.test.js b/src/routes/docx/html/route.test.js
@@ -103,7 +103,7 @@ describe("DOCX-to-HTML route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Body cannot be empty",
 			statusCode: 400,
@@ -157,7 +157,7 @@ describe("DOCX-to-HTML route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Unsupported Media Type",
 				message: "Unsupported Media Type",
 				statusCode: 415,
@@ -179,7 +179,7 @@ describe("DOCX-to-HTML route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Unsupported Media Type",
 			message: "Unsupported Media Type: application/html",
 			statusCode: 415,
@@ -199,7 +199,7 @@ describe("DOCX-to-HTML route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Not Acceptable",
 			message: "Not Acceptable",
 			statusCode: 406,

diff --git a/src/routes/docx/txt/route.test.js b/src/routes/docx/txt/route.test.js
@@ -91,7 +91,7 @@ describe("DOCX-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Body cannot be empty",
 			statusCode: 400,
@@ -145,7 +145,7 @@ describe("DOCX-to-TXT route", () => {
 				},
 			});
 
-			expect(JSON.parse(response.body)).toStrictEqual({
+			expect(response.json()).toStrictEqual({
 				error: "Unsupported Media Type",
 				message: "Unsupported Media Type",
 				statusCode: 415,
@@ -167,7 +167,7 @@ describe("DOCX-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Unsupported Media Type",
 			message: "Unsupported Media Type: application/html",
 			statusCode: 415,
@@ -187,7 +187,7 @@ describe("DOCX-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Not Acceptable",
 			message: "Not Acceptable",
 			statusCode: 406,

diff --git a/src/routes/html/txt/route.test.js b/src/routes/html/txt/route.test.js
@@ -75,7 +75,7 @@ describe("HTML-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Bad Request",
 			message: "Body cannot be empty",
 			statusCode: 400,
@@ -113,7 +113,7 @@ describe("HTML-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Unsupported Media Type",
 			message: "Unsupported Media Type",
 			statusCode: 415,
@@ -134,7 +134,7 @@ describe("HTML-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Unsupported Media Type",
 			message: "Unsupported Media Type: application/html",
 			statusCode: 415,
@@ -153,7 +153,7 @@ describe("HTML-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Not Acceptable",
 			message: "Not Acceptable",
 			statusCode: 406,

diff --git a/src/routes/pdf/html/route.test.js b/src/routes/pdf/html/route.test.js
@@ -92,7 +92,7 @@ describe("PDF-to-HTML route", () => {
 						},
 					})
 					.then((response) => {
-						expect(JSON.parse(response.body)).toStrictEqual({
+						expect(response.json()).toStrictEqual({
 							error: "Bad Request",
 							message: "Body cannot be empty",
 							statusCode: 400,
@@ -121,7 +121,7 @@ describe("PDF-to-HTML route", () => {
 						},
 					})
 					.then((response) => {
-						expect(JSON.parse(response.body)).toStrictEqual({
+						expect(response.json()).toStrictEqual({
 							error: "Unsupported Media Type",
 							message: "Unsupported Media Type",
 							statusCode: 415,
@@ -152,7 +152,7 @@ describe("PDF-to-HTML route", () => {
 						},
 					})
 					.then((response) => {
-						expect(JSON.parse(response.body)).toStrictEqual({
+						expect(response.json()).toStrictEqual({
 							error: "Unsupported Media Type",
 							message: "Unsupported Media Type: application/html",
 							statusCode: 415,
@@ -181,7 +181,7 @@ describe("PDF-to-HTML route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Not Acceptable",
 			message: "Not Acceptable",
 			statusCode: 406,

diff --git a/src/routes/pdf/txt/route.test.js b/src/routes/pdf/txt/route.test.js
@@ -143,7 +143,7 @@ describe("PDF-to-TXT route", () => {
 						},
 					})
 					.then((response) => {
-						expect(JSON.parse(response.body)).toStrictEqual({
+						expect(response.json()).toStrictEqual({
 							error: "Bad Request",
 							message: "Body cannot be empty",
 							statusCode: 400,
@@ -172,7 +172,7 @@ describe("PDF-to-TXT route", () => {
 						},
 					})
 					.then((response) => {
-						expect(JSON.parse(response.body)).toStrictEqual({
+						expect(response.json()).toStrictEqual({
 							error: "Unsupported Media Type",
 							message: "Unsupported Media Type",
 							statusCode: 415,
@@ -203,7 +203,7 @@ describe("PDF-to-TXT route", () => {
 						},
 					})
 					.then((response) => {
-						expect(JSON.parse(response.body)).toStrictEqual({
+						expect(response.json()).toStrictEqual({
 							error: "Unsupported Media Type",
 							message: "Unsupported Media Type: application/html",
 							statusCode: 415,
@@ -232,7 +232,7 @@ describe("PDF-to-TXT route", () => {
 			},
 		});
 
-		expect(JSON.parse(response.body)).toStrictEqual({
+		expect(response.json()).toStrictEqual({
 			error: "Not Acceptable",
 			message: "Not Acceptable",
 			statusCode: 406,