TODO: actually write tests lol

cmd/pkgserver/main.go

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

cmd/pkgserver/test_ui.go

@@ -1,97 +0,0 @@
-//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

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

cmd/pkgserver/ui_test/lib/style.scss

@@ -44,24 +44,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("/testui/success-closed.svg") / "success";
+        content: url("/static/success-closed.svg") / "success";
     }
     &.success[open] > summary::marker {
-        content: url("/testui/success-open.svg") / "success";
+        content: url("/static/success-open.svg") / "success";
     }
     &.failure > summary::marker {
         color: red;
-        content: url("/testui/failure-closed.svg") / "failure";
+        content: url("/static/failure-closed.svg") / "failure";
     }
     &.failure[open] > summary::marker {
-        content: url("/testui/failure-open.svg") / "failure";
+        content: url("/static/failure-open.svg") / "failure";
     }
     &.skip > summary::marker {
         color: blue;
-        content: url("/testui/skip-closed.svg") / "skip";
+        content: url("/static/skip-closed.svg") / "skip";
     }
     &.skip[open] > summary::marker {
-        content: url("/testui/skip-open.svg") / "skip";
+        content: url("/static/skip-open.svg") / "skip";
     }
 }
 

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="/testui/style.css">
+    <link rel="stylesheet" href="static/style.css">
     <title>PkgServer Tests</title>
 </head>
 <body>
@@ -23,8 +23,8 @@
 </div>
 
 <script type="module">
-    import "/test/all_tests.js";
-    import { DOMReporter, TESTS } from "/test/lib/test.js";
+    import "./static/all_tests.js";
+    import { DOMReporter, TESTS } from "./static/test.js";
     TESTS.run(new DOMReporter());
 </script>
 </main>

cmd/pkgserver/ui_test/test_tests.ts

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