TODO: test HTML injection

Dylan Huang · Dylan Huang · commit 1b421799e6fe · 2025-08-11T11:06:04.000-07:00
- also test TestAsyncWebSocketOperations
diff --git a/eval_protocol/utils/vite_server.py b/eval_protocol/utils/vite_server.py
@@ -97,7 +97,17 @@ def _setup_routes(self):
         # Mount static files
         self.app.mount("/assets", StaticFiles(directory=self.build_dir / "assets"), name="assets")
 
-        # Serve other static files from build directory
+        @self.app.get("/")
+        async def root():
+            """Serve the main index.html file with injected configuration."""
+            return self._serve_index_with_config()
+
+        @self.app.get("/health")
+        async def health():
+            """Health check endpoint."""
+            return {"status": "ok", "build_dir": str(self.build_dir)}
+
+        # Serve other static files from build directory - this must be last
         @self.app.get("/{path:path}")
         async def serve_spa(path: str):
             """
@@ -114,22 +124,12 @@ async def serve_spa(path: str):
 
             # For SPA routing, serve index.html for non-existent routes
             # but exclude API routes and asset requests
-            if not path.startswith(("api/", "assets/")):
+            if not path.startswith(("api/", "assets/", "health")):
                 return self._serve_index_with_config()
 
             # If we get here, the file doesn't exist and it's not a SPA route
             raise HTTPException(status_code=404, detail="File not found")
 
-        @self.app.get("/")
-        async def root():
-            """Serve the main index.html file with injected configuration."""
-            return self._serve_index_with_config()
-
-        @self.app.get("/health")
-        async def health():
-            """Health check endpoint."""
-            return {"status": "ok", "build_dir": str(self.build_dir)}
-
     def run(self):
         """
         Run the Vite server.
diff --git a/tests/test_logs_server.py b/tests/test_logs_server.py
@@ -378,21 +378,22 @@ class TestLogsServerIntegration:
 
     @pytest.fixture
     def temp_build_dir_with_files(self):
-        """Create a temporary build directory with various test files."""
+        """Create a temporary build directory with index.html and assets/ directory."""
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir)
 
             # Create index.html
             (temp_path / "index.html").write_text("<html><body>Test</body></html>")
 
-            # Create some static assets
-            (temp_path / "static").mkdir()
-            (temp_path / "static" / "app.js").write_text("console.log('test');")
-            (temp_path / "static" / "style.css").write_text("body { color: black; }")
+            # Create assets directory and some files inside it
+            assets_dir = temp_path / "assets"
+            assets_dir.mkdir()
+            (assets_dir / "app.js").write_text("console.log('test');")
+            (assets_dir / "style.css").write_text("body { color: black; }")
 
-            # Create a nested directory structure
-            (temp_path / "nested").mkdir()
-            (temp_path / "nested" / "file.txt").write_text("nested content")
+            # Optionally, create a nested directory inside assets
+            (assets_dir / "nested").mkdir()
+            (assets_dir / "nested" / "file.txt").write_text("nested content")
 
             yield temp_path
 
@@ -407,11 +408,11 @@ def test_static_file_serving(self, temp_build_dir_with_files):
         assert "Test" in response.text
 
         # Test serving static files
-        response = client.get("/static/app.js")
+        response = client.get("/assets/app.js")
         assert response.status_code == 200
         assert "console.log('test')" in response.text
 
-        response = client.get("/static/style.css")
+        response = client.get("/assets/style.css")
         assert response.status_code == 200
         assert "color: black" in response.text
 
@@ -442,7 +443,7 @@ def test_health_endpoint(self, temp_build_dir_with_files):
         response = client.get("/health")
         assert response.status_code == 200
         data = response.json()
-        assert data["status"] == "healthy"
+        assert data["status"] == "ok"
 
 
 @pytest.mark.asyncio
