fix some tests

aslilac · aslilac · commit c64a2efecf1d · 2025-01-11T00:41:04.000Z
diff --git a/site/site.go b/site/site.go
@@ -225,7 +225,8 @@ func (h *Handler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	// If requesting the install.sh script, fill in the template with the
 	// appropriate hostname and version info.
 	case reqFile == "install.sh":
-		h.serveInstallScript(rw, r)
+		rw.Header().Add("Content-Type", "text/plain; charset=utf-8")
+		http.ServeContent(rw, r, reqFile, time.Time{}, bytes.NewReader(h.installScript))
 		return
 	// If the original file path exists we serve it.
 	case h.exists(reqFile):
@@ -316,11 +317,6 @@ func ShouldCacheFile(reqFile string) bool {
 	return true
 }
 
-func (h *Handler) serveInstallScript(rw http.ResponseWriter, r *http.Request) {
-	rw.Header().Add("content-type", "text/plain; charset=utf-8")
-	http.ServeContent(rw, r, "install.sh", time.Time{}, bytes.NewReader(h.installScript))
-}
-
 func (h *Handler) serveHTML(resp http.ResponseWriter, request *http.Request, reqPath string, state htmlState) bool {
 	if data, err := h.renderHTMLWithState(request, reqPath, state); err == nil {
 		if reqPath == "" {
diff --git a/site/site_test.go b/site/site_test.go
@@ -41,6 +41,9 @@ func TestInjection(t *testing.T) {
 		"index.html": &fstest.MapFile{
 			Data: []byte("{{ .User }}"),
 		},
+		"install.sh": &fstest.MapFile{
+			Data: []byte{},
+		},
 	}
 	binFs := http.FS(fstest.MapFS{})
 	db := dbmem.New()
@@ -99,6 +102,9 @@ func TestInjectionFailureProducesCleanHTML(t *testing.T) {
 		"index.html": &fstest.MapFile{
 			Data: []byte("<html>{{ .User }}</html>"),
 		},
+		"install.sh": &fstest.MapFile{
+			Data: []byte{},
+		},
 	}
 	handler := site.New(&site.Options{
 		BinFS:    binFs,
@@ -144,6 +150,9 @@ func TestCaching(t *testing.T) {
 		"terminal.html": &fstest.MapFile{
 			Data: []byte("folderFile"),
 		},
+		"install.sh": &fstest.MapFile{
+			Data: []byte{},
+		},
 	}
 	binFS := http.FS(fstest.MapFS{})
 
@@ -207,6 +216,9 @@ func TestServingFiles(t *testing.T) {
 		"dashboard.css": &fstest.MapFile{
 			Data: []byte("dashboard-css-bytes"),
 		},
+		"install.sh": &fstest.MapFile{
+			Data: []byte("install-sh-bytes"),
+		},
 	}
 	binFS := http.FS(fstest.MapFS{})
 
@@ -248,6 +260,9 @@ func TestServingFiles(t *testing.T) {
 		// JS, CSS cases
 		{"/dashboard.js", "dashboard-js-bytes"},
 		{"/dashboard.css", "dashboard-css-bytes"},
+
+		// Install script
+		{"/install.sh", "install-sh-bytes"},
 	}
 
 	for _, testCase := range testCases {
@@ -348,6 +363,9 @@ func TestServingBin(t *testing.T) {
 		"dashboard.css": &fstest.MapFile{
 			Data: []byte("dashboard-css-bytes"),
 		},
+		"install.sh": &fstest.MapFile{
+			Data: []byte{},
+		},
 	}
 
 	sampleBinFSCorrupted := sampleBinFS()
