Commit bd30f068 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Remove some repetition from tests

parent 13097a93
...@@ -328,7 +328,8 @@ func TestAllowedStaticFile(t *testing.T) { ...@@ -328,7 +328,8 @@ func TestAllowedStaticFile(t *testing.T) {
} }
func TestAllowedPublicUploadsFile(t *testing.T) { func TestAllowedPublicUploadsFile(t *testing.T) {
if err := setupStaticFile("uploads/static file.txt", "PRIVATE"); err != nil { content := "PRIVATE but allowed"
if err := setupStaticFile("uploads/static file.txt", content); err != nil {
t.Fatalf("create public/uploads/static file.txt: %v", err) t.Fatalf("create public/uploads/static file.txt: %v", err)
} }
...@@ -355,8 +356,8 @@ func TestAllowedPublicUploadsFile(t *testing.T) { ...@@ -355,8 +356,8 @@ func TestAllowedPublicUploadsFile(t *testing.T) {
if _, err := io.Copy(buf, resp.Body); err != nil { if _, err := io.Copy(buf, resp.Body); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if buf.String() != "PRIVATE" { if buf.String() != content {
t.Fatalf("GET %q: Expected PRIVATE, got %q", resource, buf.String()) t.Fatalf("GET %q: Expected %q, got %q", resource, content, buf.String())
} }
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
t.Fatalf("GET %q: expected 200, got %d", resource, resp.StatusCode) t.Fatalf("GET %q: expected 200, got %d", resource, resp.StatusCode)
...@@ -368,7 +369,8 @@ func TestAllowedPublicUploadsFile(t *testing.T) { ...@@ -368,7 +369,8 @@ func TestAllowedPublicUploadsFile(t *testing.T) {
} }
func TestDeniedPublicUploadsFile(t *testing.T) { func TestDeniedPublicUploadsFile(t *testing.T) {
if err := setupStaticFile("uploads/static.txt", "PRIVATE"); err != nil { content := "PRIVATE"
if err := setupStaticFile("uploads/static.txt", content); err != nil {
t.Fatalf("create public/uploads/static.txt: %v", err) t.Fatalf("create public/uploads/static.txt: %v", err)
} }
...@@ -394,7 +396,7 @@ func TestDeniedPublicUploadsFile(t *testing.T) { ...@@ -394,7 +396,7 @@ func TestDeniedPublicUploadsFile(t *testing.T) {
if _, err := io.Copy(buf, resp.Body); err != nil { if _, err := io.Copy(buf, resp.Body); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if buf.String() == "PRIVATE" { if buf.String() == content {
t.Fatalf("GET %q: Got private file contents which should have been blocked by upstream", resource) t.Fatalf("GET %q: Got private file contents which should have been blocked by upstream", resource)
} }
if resp.StatusCode != 404 { if resp.StatusCode != 404 {
......
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