Commit c718f889 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'fix-fmt' into 'master'

Avoid an ambiguously formattable directive

See merge request gitlab-org/gitlab-workhorse!354
parents 8843aae4 e9ba9905
...@@ -77,11 +77,10 @@ func TestAllowExistentContentHeaders(t *testing.T) { ...@@ -77,11 +77,10 @@ func TestAllowExistentContentHeaders(t *testing.T) {
func TestSuccessOverrideContentHeadersFeatureEnabled(t *testing.T) { func TestSuccessOverrideContentHeadersFeatureEnabled(t *testing.T) {
fixturePath := "../../testdata/forgedfile.png" fixturePath := "../../testdata/forgedfile.png"
httpHeaders := map[string]string{ httpHeaders := make(map[string]string)
headers.ContentTypeHeader: "image/png", httpHeaders[headers.ContentTypeHeader] = "image/png"
headers.ContentDispositionHeader: "inline", httpHeaders[headers.ContentDispositionHeader] = "inline"
"Range": "bytes=1-2", httpHeaders["Range"] = "bytes=1-2"
}
resp := makeRequest(t, fixturePath, httpHeaders) resp := makeRequest(t, fixturePath, httpHeaders)
require.Equal(t, "image/png", resp.Header.Get(headers.ContentTypeHeader)) require.Equal(t, "image/png", resp.Header.Get(headers.ContentTypeHeader))
......
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