add error message

pyscript · madhur-tandon · May 2, 2023 · Apr 10, 2023 · Apr 10, 2023 · Apr 10, 2023
commit 97bc5d55acdcfb4f2153a7a15bdccdb7642e19e5
diff --git a/pyscriptjs/tests/integration/conftest.py b/pyscriptjs/tests/integration/conftest.py
@@ -148,14 +148,22 @@ def dev_server(logger):
     class MyHTTPRequestHandler(SimpleHTTPRequestHandler):
         enable_cors_headers = True
 
+        @classmethod
+        def my_headers(cls):
+            if cls.enable_cors_headers:
+                return {
+                    "Cross-Origin-Embedder-Policy": "require-corp",
+                    "Cross-Origin-Opener-Policy": "same-origin",
+                }
+            return {}
+
         def end_headers(self):
             self.send_my_headers()
             SimpleHTTPRequestHandler.end_headers(self)
 
         def send_my_headers(self):
-            if self.enable_cors_headers:
-                self.send_header("Cross-Origin-Embedder-Policy", "require-corp")
-                self.send_header("Cross-Origin-Opener-Policy", "same-origin")
+            for k, v in self.my_headers().items():
+                self.send_header(k, v)
 
         def log_message(self, fmt, *args):
             logger.log("http_server", fmt % args, color="blue")

diff --git a/pyscriptjs/tests/integration/support.py b/pyscriptjs/tests/integration/support.py
@@ -49,6 +49,10 @@ class PyScriptTest:
     # Pyodide always print()s this message upon initialization. Make it
     # available to all tests so that it's easiert to check.
     PY_COMPLETE = "Python initialization complete"
+    REQUIRED_HEADERS = {
+        "Cross-Origin-Embedder-Policy": "require-corp",
+        "Cross-Origin-Opener-Policy": "same-origin",
+    }
 
     @pytest.fixture()
     def init(self, request, tmpdir, logger, page):
@@ -126,6 +130,12 @@ def init_page(self, page):
         page.on("console", self._on_console)
         page.on("pageerror", self._on_pageerror)
 
+    @property
+    def headers(self):
+        if self.dev_server is None:
+            return self.router.headers
+        return self.dev_server.RequestHandlerClass.my_headers()
+
     def disable_cors_headers(self):
         if self.dev_server is None:
             self.router.enable_cors_headers = False
@@ -223,6 +233,8 @@ def goto(self, path):
         self.logger.reset()
         self.logger.log("page.goto", path, color="yellow")
         url = f"{self.http_server_addr}/{path}"
+        if self.headers != self.REQUIRED_HEADERS:
+            self.page.evaluate("console.error('PyScript needs CORS headers to be set.')")
         self.page.goto(url, timeout=0)
 
     def wait_for_console(self, text, *, timeout=None, check_js_errors=True):
@@ -657,8 +669,6 @@ class SmartRouter:
         locally
     """
 
-    enable_cors_headers = True
-
     @dataclass
     class CachedResponse:
         """
@@ -688,6 +698,16 @@ def __init__(self, fake_server, *, cache, logger, usepdb=False):
         self.usepdb = usepdb
         self.page = None
         self.requests = []  # (status, kind, url)
+        self.enable_cors_headers = True
+
+    @property
+    def headers(self):
+        if self.enable_cors_headers:
+            return {
+                "Cross-Origin-Embedder-Policy": "require-corp",
+                "Cross-Origin-Opener-Policy": "same-origin",
+            }
+        return {}
 
     def install(self, page):
         """
@@ -739,17 +759,10 @@ def _router(self, route):
             self.log_request(200, "fake_server", full_url)
             assert url.path[0] == "/"
             relative_path = url.path[1:]
-            if self.enable_cors_headers:
-                headers = {
-                    "Cross-Origin-Embedder-Policy": "require-corp",
-                    "Cross-Origin-Opener-Policy": "same-origin",
-                }
-            else:
-                headers = {}
             if os.path.exists(relative_path):
-                route.fulfill(status=200, headers=headers, path=relative_path)
+                route.fulfill(status=200, headers=self.headers, path=relative_path)
             else:
-                route.fulfill(status=404, headers=headers)
+                route.fulfill(status=404, headers=self.headers)
             return
 
         # network requests might be cached

diff --git a/pyscriptjs/tests/integration/test_00_support.py b/pyscriptjs/tests/integration/test_00_support.py
@@ -41,6 +41,8 @@ def test_no_cors_headers(self):
         """
         self.writefile("mytest.html", doc)
         self.goto("mytest.html")
+        assert self.headers == {}
+        assert self.console.error.lines[-1] == "PyScript needs CORS headers to be set."
         assert self.console.log.lines[-1] == "false"
 
     def test_await_with_run_js(self):