bij1
/
gogreen
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #151 from joonas/user-agent-format 

Follow User-Agent header field recommendations
This commit is contained in:
Joonas Bergius 2017-09-23 09:50:20 -06:00 committed by GitHub
parent b55291bf0c ac5e3a015f
commit 6590ae2b11
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
godo.go
View File

@ -210,7 +210,7 @@ func SetBaseURL(bu string) ClientOpt {
// SetUserAgent is a client option for setting the user agent.
func SetUserAgent(ua string) ClientOpt {
return func(c *Client) error {
c.UserAgent = fmt.Sprintf("%s+%s", ua, c.UserAgent)
c.UserAgent = fmt.Sprintf("%s %s", ua, c.UserAgent)
return nil
}
}

11
godo_test.go
View File

@ -106,7 +106,7 @@ func testClientDefaultBaseURL(t *testing.T, c *Client) {
func testClientDefaultUserAgent(t *testing.T, c *Client) {
if c.UserAgent != userAgent {
t.Errorf("NewClick UserAgent = %v, expected %v", c.UserAgent, userAgent)
t.Errorf("NewClient UserAgent = %v, expected %v", c.UserAgent, userAgent)
}
}
@ -193,7 +193,7 @@ func TestNewRequest_badURL(t *testing.T) {
}
func TestNewRequest_withCustomUserAgent(t *testing.T) {
ua := "testing"
ua := "testing/0.0.1"
c, err := New(nil, SetUserAgent(ua))
if err != nil {
@ -202,7 +202,7 @@ func TestNewRequest_withCustomUserAgent(t *testing.T) {
req, _ := c.NewRequest(ctx, http.MethodGet, "/foo", nil)
expected := fmt.Sprintf("%s+%s", ua, userAgent)
expected := fmt.Sprintf("%s %s", ua, userAgent)
if got := req.Header.Get("User-Agent"); got != expected {
t.Errorf("New() UserAgent = %s; expected %s", got, expected)
}
@ -506,13 +506,14 @@ func TestAddOptions(t *testing.T) {
}
func TestCustomUserAgent(t *testing.T) {
c, err := New(nil, SetUserAgent("testing"))
ua := "testing/0.0.1"
c, err := New(nil, SetUserAgent(ua))
if err != nil {
t.Fatalf("New() unexpected error: %v", err)
}
expected := fmt.Sprintf("%s+%s", "testing", userAgent)
expected := fmt.Sprintf("%s %s", ua, userAgent)
if got := c.UserAgent; got != expected {
t.Errorf("New() UserAgent = %s; expected %s", got, expected)
}