GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-13 07:39:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: failed to load json/data content in api reference

Browse Source
This commit is contained in:
xucong053
2022-06-20 10:15:30 +08:00
parent abfd6bb53a
commit a34751a13d
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hrp/step_api.go
View File

@@ -47,7 +47,11 @@ func (path *APIPath) ToAPI() (*API, error) {
if err != nil {
return nil, err
}
// 1. deal with request body compatibility
convertCompatRequestBody(api.Request)
// 2. deal with validators compatibility
err = convertCompatValidator(api.Validators)
// 3. deal with extract expr including hyphen
convertExtract(api.Extract)
return api, err
}

24
hrp/testcase.go
View File

@@ -182,16 +182,7 @@ func (tc *TCase) MakeCompat() (err error) {
}()
for _, step := range tc.TestSteps {
// 1. deal with request body compatibility
if step.Request != nil && step.Request.Body == nil {
if step.Request.Json != nil {
step.Request.Headers["Content-Type"] = "application/json; charset=utf-8"
step.Request.Body = step.Request.Json
step.Request.Json = nil
} else if step.Request.Data != nil {
step.Request.Body = step.Request.Data
step.Request.Data = nil
}
}
convertCompatRequestBody(step.Request)
// 2. deal with validators compatibility
err = convertCompatValidator(step.Validators)
@@ -205,6 +196,19 @@ func (tc *TCase) MakeCompat() (err error) {
return nil
}
func convertCompatRequestBody(request *Request) {
if request != nil && request.Body == nil {
if request.Json != nil {
request.Headers["Content-Type"] = "application/json; charset=utf-8"
request.Body = request.Json
request.Json = nil
} else if request.Data != nil {
request.Body = request.Data
request.Data = nil
}
}
}
func convertCompatValidator(Validators []interface{}) (err error) {
for i, iValidator := range Validators {
if _, ok := iValidator.(Validator); ok {