Commit d66ef4e4 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'static-assets-relative' into 'master'

Configure URLPrefix before building routes

Fixes #19 

See merge request !32
parents adada74d 21485408
...@@ -41,8 +41,8 @@ func NewUpstream(backend *url.URL, socket string, version string, documentRoot s ...@@ -41,8 +41,8 @@ func NewUpstream(backend *url.URL, socket string, version string, documentRoot s
if backend == nil { if backend == nil {
up.Backend = DefaultBackend up.Backend = DefaultBackend
} }
up.configureRoutes()
up.configureURLPrefix() up.configureURLPrefix()
up.configureRoutes()
return &up return &up
} }
......
...@@ -364,6 +364,37 @@ func TestAllowedStaticFile(t *testing.T) { ...@@ -364,6 +364,37 @@ func TestAllowedStaticFile(t *testing.T) {
} }
} }
func TestStaticFileRelativeURL(t *testing.T) {
content := "PUBLIC"
if err := setupStaticFile("static.txt", content); err != nil {
t.Fatalf("create public/static.txt: %v", err)
}
ts := testhelper.TestServerWithHandler(regexp.MustCompile(`.`), http.HandlerFunc(http.NotFound))
defer ts.Close()
backendURLString := ts.URL + "/my-relative-url"
log.Print(backendURLString)
ws := startWorkhorseServer(backendURLString)
defer ws.Close()
resource := "/my-relative-url/static.txt"
resp, err := http.Get(ws.URL + resource)
if err != nil {
t.Error(err)
}
defer resp.Body.Close()
buf := &bytes.Buffer{}
if _, err := io.Copy(buf, resp.Body); err != nil {
t.Error(err)
}
if buf.String() != content {
t.Errorf("GET %q: Expected %q, got %q", resource, content, buf.String())
}
if resp.StatusCode != 200 {
t.Errorf("GET %q: expected 200, got %d", resource, resp.StatusCode)
}
}
func TestAllowedPublicUploadsFile(t *testing.T) { func TestAllowedPublicUploadsFile(t *testing.T) {
content := "PRIVATE but allowed" content := "PRIVATE but allowed"
if err := setupStaticFile("uploads/static file.txt", content); err != nil { if err := setupStaticFile("uploads/static file.txt", content); err != nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment