diff --git a/moli-benchmark/moli_benchmark/wpt_cross/server.py b/moli-benchmark/moli_benchmark/wpt_cross/server.py index a86a7558c8a..1132805e960 100644 --- a/moli-benchmark/moli_benchmark/wpt_cross/server.py +++ b/moli-benchmark/moli_benchmark/wpt_cross/server.py @@ -153,6 +153,7 @@ SERVICE_WORKER_SCRIPT_RESOURCE_PATHS = { "/service-workers/service-worker/resources/invalid-chunked-encoding.py", "/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py", "/service-workers/service-worker/resources/redirect.py", + "/service-workers/service-worker/resources/scope1/redirect.py", "/service-workers/service-worker/resources/update-worker.py", "/service-workers/service-worker/resources/update-worker-from-file.py", "/service-workers/service-worker/resources/update-during-installation-worker.py", diff --git a/moli-benchmark/tests/test_wpt_service_worker_script_server.py b/moli-benchmark/tests/test_wpt_service_worker_script_server.py index c31bc51cb0e..eb4b1b0a37a 100644 --- a/moli-benchmark/tests/test_wpt_service_worker_script_server.py +++ b/moli-benchmark/tests/test_wpt_service_worker_script_server.py @@ -36,7 +36,7 @@ class ServiceWorkerScriptFixtureTests(unittest.TestCase): for name in ( "mime-type-worker.py", "import-mime-type-worker.py", "malformed-worker.py", "invalid-chunked-encoding.py", "invalid-chunked-encoding-with-flush.py", - "redirect.py", "update-worker.py", "update-worker-from-file.py", "import-scripts-version.py", + "redirect.py", "scope1/redirect.py", "update-worker.py", "update-worker-from-file.py", "import-scripts-version.py", "update-during-installation-worker.py", "import-scripts-get.py", "import-scripts-echo.py", "subdir/import-scripts-echo.py", "scope2/import-scripts-echo.py", @@ -82,28 +82,32 @@ class ServiceWorkerScriptFixtureTests(unittest.TestCase): ("ACACredentials", "true"), ("ACEHeaders", "X-Result"), ]) - for method in ("GET", "HEAD", "POST", "OPTIONS", "PUT", "YO", "CUSTOM"): - with self.subTest(method=method): - status, headers, body = self.request(server.port, "redirect.py", query, method=method) - self.assertEqual(status, 307) - self.assertEqual(body, b"") - self.assertEqual(dict(headers)["location"], "../target.js?one=1&two=%20") - self.assertEqual( - [value for name, value in headers if name == "access-control-allow-origin"], - ["https://one.test", "https://two.test"], - ) - for name, value in ( - ("access-control-allow-headers", "X-One, X-Two"), - ("access-control-allow-methods", "GET, OPTIONS"), - ("access-control-allow-credentials", "true"), - ("access-control-expose-headers", "X-Result"), - ): - self.assertEqual(dict(headers)[name], value) - self.assertNotIn("content-type", dict(headers)) - self.assertNotIn("cache-control", dict(headers)) - status, headers, _ = self.request(server.port, "%72edirect.py", "Redirect=%FF") - self.assertEqual(status, 302) - self.assertEqual(dict(headers)["location"], "\xff") + # scope1/redirect.py delegates to the same upstream main function. + for resource in ("redirect.py", "scope1/redirect.py"): + for method in ("GET", "HEAD", "POST", "OPTIONS", "PUT", "YO", "CUSTOM"): + with self.subTest(resource=resource, method=method): + status, headers, body = self.request(server.port, resource, query, method=method) + self.assertEqual(status, 307) + self.assertEqual(body, b"") + self.assertEqual(dict(headers)["location"], "../target.js?one=1&two=%20") + self.assertEqual( + [value for name, value in headers if name == "access-control-allow-origin"], + ["https://one.test", "https://two.test"], + ) + for name, value in ( + ("access-control-allow-headers", "X-One, X-Two"), + ("access-control-allow-methods", "GET, OPTIONS"), + ("access-control-allow-credentials", "true"), + ("access-control-expose-headers", "X-Result"), + ): + self.assertEqual(dict(headers)[name], value) + self.assertNotIn("content-type", dict(headers)) + self.assertNotIn("cache-control", dict(headers)) + status, headers, _ = self.request( + server.port, resource.replace("redirect.py", "%72edirect.py"), "Redirect=%FF", + ) + self.assertEqual(status, 302) + self.assertEqual(dict(headers)["location"], "\xff") def test_registration_mime_handlers_preserve_missing_empty_and_raw_values(self) -> None: server = self.server()