internal change
PiperOrigin-RevId: 198990637
diff --git a/internal/devserver/devserver.go b/internal/devserver/devserver.go
index ee649b4..417d7a7 100644
--- a/internal/devserver/devserver.go
+++ b/internal/devserver/devserver.go
@@ -123,7 +123,7 @@
defaultIndex := filepath.Join(base, pkg, "index.html")
if _, err := os.Stat(defaultIndex); err == nil {
http.ServeFile(w, r, defaultIndex)
- break
+ return
}
}
content := bytes.NewReader(defaultPage)
diff --git a/internal/devserver/devserver_test.go b/internal/devserver/devserver_test.go
index 0ce23c0..2fc77c1 100644
--- a/internal/devserver/devserver_test.go
+++ b/internal/devserver/devserver_test.go
@@ -61,6 +61,7 @@
handler := CreateFileHandler("/app.js", "manifest.MF", []string{"pkg1", "pkg2"},
filepath.Join(os.Getenv("TEST_TMPDIR"), "TestIndexServing"))
+ defaultPageContent := `<script src="/app.js">`
tests := []struct {
code int
@@ -91,9 +92,9 @@
// generated index for root.
{http.StatusOK, "/", `<script src="/app.js">`, true},
// generated index as a response to not found handler.
- {http.StatusNotFound, "/no/such/dir", `<script src="/app.js">`, true},
+ {http.StatusNotFound, "/no/such/dir", defaultPageContent, true},
// generated index file as a response to a directory that is found.
- {http.StatusNotFound, "/pkg2/", `<script src="/app.js">`, true},
+ {http.StatusNotFound, "/pkg2/", defaultPageContent, true},
}
for _, tst := range tests {
@@ -107,5 +108,8 @@
if !strings.Contains(body, tst.content) {
t.Errorf("expected %q to contain %q, got %q", tst.url, tst.content, body)
}
+ if !tst.delIdx && strings.Contains(body, defaultPageContent) {
+ t.Errorf("got %q, default page shouldn't be part of response", body)
+ }
}
}
