Merge pull request #875 from 99designs/fix-clientwide-opts

Fix client global options

client/client.go

@@ -111,7 +111,7 @@ func (p *Client) newRequest(query string, options ...Option) (*http.Request, err
 	bd.HTTP.Header.Set("Content-Type", "application/json")
 
 	// per client options from client.New apply first
-	for _, option := range options {
+	for _, option := range p.opts {
 		option(bd)
 	}
 	// per request options

client/client_test.go

@@ -54,6 +54,19 @@ func TestAddHeader(t *testing.T) {
 	)
 }
 
+func TestAddClientHeader(t *testing.T) {
+	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "ASDF", r.Header.Get("Test-Key"))
+
+		w.Write([]byte(`{}`))
+	})
+
+	c := client.New(h, client.AddHeader("Test-Key", "ASDF"))
+
+	var resp struct{}
+	c.MustPost("{ id }", &resp)
+}
+
 func TestBasicAuth(t *testing.T) {
 	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		user, pass, ok := r.BasicAuth()