tests: improve worker code coverage

SharzyL · SharzyL · commit 920720746486 · 2025-04-27T23:40:10.000+08:00
diff --git a/src/common.ts b/src/common.ts
@@ -45,7 +45,7 @@ export function escapeHtml(str: string): string {
     ['"', "&quot"],
     ["'", "&#x27"],
   ])
-  return str.replace(/[&<>]/g, function (tag): string {
+  return str.replace(/[&<>"']/g, function (tag): string {
     return tagsToReplace.get(tag) || tag
   })
 }
diff --git a/test/basic.spec.ts b/test/basic.spec.ts
@@ -185,5 +185,3 @@ test("custom passwd", async () => {
   expect(putResponseJson.url).toStrictEqual(url) // url will not change
   expect(putResponseJson.manageUrl).toStrictEqual(`${url}:${wrongPasswd}`) // passwd may change
 })
-
-// TODO: add tests for CORS
diff --git a/test/controlHeaders.spec.ts b/test/controlHeaders.spec.ts
@@ -102,3 +102,46 @@ test("content disposition with specifying filename", async () => {
     `attachment; filename*=UTF-8''${altFilename}`,
   )
 })
+
+test("other HTTP methods", async () => {
+  const ctx = createExecutionContext()
+  const resp = await workerFetch(
+    ctx,
+    new Request(BASE_URL, {
+      method: "PATCH",
+    }),
+  )
+  expect(resp.status).toStrictEqual(405)
+  expect(resp.headers.has("Allow")).toBeTruthy()
+})
+
+test("option method", async () => {
+  const ctx = createExecutionContext()
+
+  const resp = await workerFetch(
+    ctx,
+    new Request(BASE_URL, {
+      method: "OPTIONS",
+      headers: {
+        Origin: "https://example.com",
+        "Access-Control-Request-Method": "PUT",
+      },
+    }),
+  )
+  expect(resp.status).toStrictEqual(200)
+  expect(resp.headers.has("Access-Control-Allow-Origin")).toBeTruthy()
+  expect(resp.headers.has("Access-Control-Allow-Methods")).toBeTruthy()
+  expect(resp.headers.has("Access-Control-Max-Age")).toBeTruthy()
+
+  const resp1 = await workerFetch(
+    ctx,
+    new Request(BASE_URL, {
+      method: "OPTIONS",
+      headers: {
+        Origin: "https://example.com",
+      },
+    }),
+  )
+  expect(resp1.status).toStrictEqual(200)
+  expect(resp1.headers.has("Allow")).toBeTruthy()
+})
diff --git a/test/pages.spec.ts b/test/pages.spec.ts
@@ -38,7 +38,8 @@ test("url redirect", async () => {
     return url.slice(0, splitPoint) + "/u" + url.slice(splitPoint)
   }
 
-  expect(uploadResp["suggestedUrl"].includes(makeRedirectUrl(url)))
+  expect(uploadResp.suggestedUrl).toBeDefined()
+  expect(uploadResp.suggestedUrl!.includes(makeRedirectUrl(url)))
 
   const resp = await workerFetch(ctx, makeRedirectUrl(url))
   expect(resp.status).toStrictEqual(302)
@@ -63,12 +64,16 @@ test("url redirect with illegal url", async () => {
 })
 
 test("highlight", async () => {
-  const content = 'print("hello world")'
+  const content = 'print("<hello world>")'
   const ctx = createExecutionContext()
-  const url = (await upload(ctx, { c: content }))["url"]
+  const url = (await upload(ctx, { c: content })).url
   const resp = await workerFetch(ctx, `${url}?lang=html`)
   expect(resp.status).toStrictEqual(200)
   const body = await resp.text()
   expect(body.includes("language-html")).toBeTruthy()
-  expect(body.includes(content)).toBeTruthy()
+  expect(body.includes("print(&quot&lt;hello world&gt;&quot)")).toBeTruthy()
+
+  const resp1 = await workerFetch(ctx, `${url}?lang=<html>`)
+  const body1 = await resp1.text()
+  expect(body1.includes("language-&lt;html&gt;")).toBeTruthy()
 })

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export function escapeHtml(str: string): string {`
`45`	`45`	`['"', "&quot"],`
`46`	`46`	`["'", "&#x27"],`
`47`	`47`	`])`
`48`		`- return str.replace(/[&<>]/g, function (tag): string {`
	`48`	`+ return str.replace(/[&<>"']/g, function (tag): string {`
`49`	`49`	`return tagsToReplace.get(tag) \|\| tag`
`50`	`50`	`})`
`51`	`51`	`}`