cmd/pkgserver: relocate JS tests

.gitignore

@@ -31,6 +31,10 @@ go.work.sum
 /cmd/pkgserver/ui/static/*.js
 /cmd/pkgserver/ui/static/*.css*
 /cmd/pkgserver/ui/static/*.css.map
+/cmd/pkgserver/ui_test/*.js
+/cmd/pkgserver/ui_test/lib/*.js
+/cmd/pkgserver/ui_test/lib/*.css*
+/cmd/pkgserver/ui_test/lib/*.css.map
 /internal/pkg/testdata/testtool
 /internal/rosa/hakurei_current.tar.gz
 

cmd/pkgserver/main.go

@@ -82,6 +82,7 @@ func main() {
 		}()
 		var mux http.ServeMux
 		uiRoutes(&mux)
+		testUiRoutes(&mux)
 		index.registerAPI(&mux)
 		server := http.Server{
 			Addr:    flagAddr,

cmd/pkgserver/test_ui.go

@@ -0,0 +1,97 @@
+//go:build frontend && frontend_test
+
+package main
+
+import (
+	"embed"
+	"net/http"
+	"path"
+	"strings"
+)
+
+//go:generate tsc -p ui_test
+//go:generate sass ui_test/lib/ui.scss ui_test/lib/ui.css
+//go:embed ui_test/*
+var test_content embed.FS
+
+func serveTestWebUI(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("X-Content-Type-Options", "nosniff")
+	w.Header().Set("X-XSS-Protection", "1")
+	w.Header().Set("X-Frame-Options", "DENY")
+
+	http.ServeFileFS(w, r, test_content, "ui_test/lib/ui.html")
+}
+
+func serveTestWebUIStaticContent(w http.ResponseWriter, r *http.Request) {
+	switch r.URL.Path {
+	case "/testui/style.css":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/ui.css")
+	case "/testui/skip-closed.svg":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/skip-closed.svg")
+	case "/testui/skip-open.svg":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/skip-open.svg")
+	case "/testui/success-closed.svg":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/success-closed.svg")
+	case "/testui/success-open.svg":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/success-open.svg")
+	case "/testui/failure-closed.svg":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/failure-closed.svg")
+	case "/testui/failure-open.svg":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/failure-open.svg")
+	default:
+		http.NotFound(w, r)
+	}
+}
+
+func serveTestLibrary(w http.ResponseWriter, r *http.Request) {
+	switch r.URL.Path {
+	case "/test/lib/test.js":
+		http.ServeFileFS(w, r, test_content, "ui_test/lib/test.js")
+	default:
+		http.NotFound(w, r)
+	}
+}
+
+func serveTests(w http.ResponseWriter, r *http.Request) {
+	if r.URL.Path == "/test/" {
+		http.Redirect(w, r, "/test.html", http.StatusMovedPermanently)
+		return
+	}
+	testPath := strings.TrimPrefix(r.URL.Path, "/test/")
+
+	if path.Ext(testPath) != ".js" {
+		http.Error(w, "403 forbidden", http.StatusForbidden)
+	}
+
+	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	w.Header().Set("Pragma", "no-cache")
+	w.Header().Set("Expires", "0")
+
+	http.ServeFileFS(w, r, test_content, "ui_test/"+testPath)
+}
+
+func redirectUI(w http.ResponseWriter, r *http.Request) {
+	// The base path should not redirect to the root.
+	if r.URL.Path == "/ui/" {
+		http.NotFound(w, r)
+		return
+	}
+	if path.Ext(r.URL.Path) != ".js" {
+		http.Error(w, "403 forbidden", http.StatusForbidden)
+		return
+	}
+
+	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	w.Header().Set("Pragma", "no-cache")
+	w.Header().Set("Expires", "0")
+
+	http.Redirect(w, r, strings.TrimPrefix(r.URL.Path, "/ui"), http.StatusFound)
+}
+
+func testUiRoutes(mux *http.ServeMux) {
+	mux.HandleFunc("GET /test.html", serveTestWebUI)
+	mux.HandleFunc("GET /testui/", serveTestWebUIStaticContent)
+	mux.HandleFunc("GET /test/lib", serveTestLibrary)
+	mux.HandleFunc("GET /test/", serveTests)
+	mux.HandleFunc("GET /ui/", redirectUI)
+}

cmd/pkgserver/test_ui_stub.go

@@ -0,0 +1,7 @@
+//go:build !(frontend && frontend_test)
+
+package main
+
+import "net/http"
+
+func testUiRoutes(mux *http.ServeMux) {}

cmd/pkgserver/ui.go

@@ -25,38 +25,14 @@ func serveStaticContent(w http.ResponseWriter, r *http.Request) {
 		http.ServeFileFS(w, r, content, "ui/static/favicon.ico")
 	case "/static/index.js":
 		http.ServeFileFS(w, r, content, "ui/static/index.js")
-	case "/static/test.js":
-		http.ServeFileFS(w, r, content, "ui/static/test.js")
-	case "/static/test.css":
-		http.ServeFileFS(w, r, content, "ui/static/test.css")
-	case "/static/all_tests.js":
-		http.ServeFileFS(w, r, content, "ui/static/all_tests.js")
-	case "/static/test_tests.js":
-		http.ServeFileFS(w, r, content, "ui/static/test_tests.js")
-	case "/static/success-closed.svg":
-		http.ServeFileFS(w, r, content, "ui/static/success-closed.svg")
-	case "/static/success-open.svg":
-		http.ServeFileFS(w, r, content, "ui/static/success-open.svg")
-	case "/static/failure-closed.svg":
-		http.ServeFileFS(w, r, content, "ui/static/failure-closed.svg")
-	case "/static/failure-open.svg":
-		http.ServeFileFS(w, r, content, "ui/static/failure-open.svg")
-	case "/static/skip-closed.svg":
-		http.ServeFileFS(w, r, content, "ui/static/skip-closed.svg")
-	case "/static/skip-open.svg":
-		http.ServeFileFS(w, r, content, "ui/static/skip-open.svg")
 	default:
 		http.NotFound(w, r)
 
 	}
 }
-func serveTester(w http.ResponseWriter, r *http.Request) {
-	http.ServeFileFS(w, r, content, "ui/test.html")
-}
 
 func uiRoutes(mux *http.ServeMux) {
 	mux.HandleFunc("GET /{$}", serveWebUI)
 	mux.HandleFunc("GET /favicon.ico", serveStaticContent)
 	mux.HandleFunc("GET /static/", serveStaticContent)
-	mux.HandleFunc("GET /test.html", serveTester)
 }

cmd/pkgserver/ui_full.go

@@ -4,6 +4,6 @@ package main
 
 import "embed"
 
-//go:generate sh -c "sass ui/static/dark.scss ui/static/dark.css && sass ui/static/light.scss ui/static/light.css && sass ui/static/test.scss ui/static/test.css && tsc -p ui/static"
+//go:generate sh -c "sass ui/static/dark.scss ui/static/dark.css && sass ui/static/light.scss ui/static/light.css && tsc -p ui/static"
 //go:embed ui/*
 var content embed.FS

cmd/pkgserver/ui_test/lib/cli.ts

@@ -4,7 +4,7 @@
 // provides faster iteration, especially for those acclimated to test-driven
 // development.
 
-import "./all_tests.js";
+import "../all_tests.js";
 import { StreamReporter, TESTS } from "./test.js";
 
 // TypeScript doesn't like process and Deno as their type definitions aren't

cmd/pkgserver/ui_test/lib/go_test_entrypoint.ts

@@ -1,3 +1,3 @@
-import "./all_tests.js";
+import "../all_tests.js";
 import { GoTestReporter, TESTS } from "./test.js";
 TESTS.run(new GoTestReporter());

cmd/pkgserver/ui_test/lib/ui.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="static/test.css">
+    <link rel="stylesheet" href="/testui/style.css">
     <title>PkgServer Tests</title>
 </head>
 <body>
@@ -23,8 +23,8 @@
 </div>
 
 <script type="module">
-    import "./static/all_tests.js";
-    import { DOMReporter, TESTS } from "./static/test.js";
+    import "/test/all_tests.js";
+    import { DOMReporter, TESTS } from "/test/lib/test.js";
     TESTS.run(new DOMReporter());
 </script>
 </main>

cmd/pkgserver/ui_test/lib/ui.scss

@@ -45,24 +45,24 @@ details.test-node {
          * [3]: https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/summary#changing_the_summarys_icon
          */
         color: var(--fg);
-        content: url("/static/success-closed.svg") / "success";
+        content: url("/testui/success-closed.svg") / "success";
     }
     &.success[open] > summary::marker {
-        content: url("/static/success-open.svg") / "success";
+        content: url("/testui/success-open.svg") / "success";
     }
     &.failure > summary::marker {
         color: red;
-        content: url("/static/failure-closed.svg") / "failure";
+        content: url("/testui/failure-closed.svg") / "failure";
     }
     &.failure[open] > summary::marker {
-        content: url("/static/failure-open.svg") / "failure";
+        content: url("/testui/failure-open.svg") / "failure";
     }
     &.skip > summary::marker {
         color: blue;
-        content: url("/static/skip-closed.svg") / "skip";
+        content: url("/testui/skip-closed.svg") / "skip";
     }
     &.skip[open] > summary::marker {
-        content: url("/static/skip-open.svg") / "skip";
+        content: url("/testui/skip-open.svg") / "skip";
     }
 }
 

cmd/pkgserver/ui_test/test_tests.ts

@@ -1,4 +1,4 @@
-import { NoOpReporter, TestRegistrar, context, group, suite, test } from "./test.js";
+import { NoOpReporter, TestRegistrar, context, group, suite, test } from "./lib/test.js";
 
 suite("dog", [
     group("tail", [

cmd/pkgserver/ui_test/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "target": "ES2024"
+  }
+}