Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions net/ghttp/ghttp_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,13 @@ func (r *Request) IsExited() bool {
}

// GetHeader retrieves and returns the header value with given `key`.
func (r *Request) GetHeader(key string) string {
return r.Header.Get(key)
// It returns the optional `def` parameter if the header does not exist.
func (r *Request) GetHeader(key string, def ...string) string {
value := r.Header.Get(key)
if value == "" && len(def) > 0 {
value = def[0]
}
return value
}

// GetHost returns current request host name, which might be a domain or an IP without port.
Expand Down
16 changes: 13 additions & 3 deletions net/ghttp/ghttp_z_unit_feature_request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,11 @@ func Test_Params_Basic(t *testing.T) {
func Test_Params_Header(t *testing.T) {
s := g.Server(guid.S())
s.BindHandler("/header", func(r *ghttp.Request) {
r.Response.Write(r.GetHeader("test"))
r.Response.Write(map[string]interface{}{
"without-def": r.GetHeader("no-header"),
"with-def": r.GetHeader("no-header", "my-default"),
"x-custom-with": r.GetHeader("x-custom", "my-default"),
})
})
s.SetDumpRouterMap(false)
s.Start()
Expand All @@ -374,8 +378,14 @@ func Test_Params_Header(t *testing.T) {
prefix := fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())
client := g.Client()
client.SetPrefix(prefix)

t.Assert(client.Header(g.MapStrStr{"test": "123456"}).GetContent(ctx, "/header"), "123456")
client.SetHeader("x-custom", "custom-value")

resp := client.GetContent(ctx, "/header")
t.Assert(gjson.New(resp).Map(), g.Map{
"without-def": "",
"with-def": "my-default",
"x-custom-with": "custom-value",
})
})
}

Expand Down
Loading