GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-30 04:49:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: post data with body

Browse Source
This commit is contained in:
debugtalk
2021-10-15 21:12:22 +08:00
parent 54531339f8
commit 65712f626a
14 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runner.go
View File

@@ -134,19 +134,17 @@ func (r *Runner) runStepRequest(step *TStep) (stepData *StepData, err error) {
}
v = append(v, req.Param(params.(map[string]interface{})))
}
if step.Request.Data != nil {
data, err := parseData(step.Request.Data, step.Variables)
if step.Request.Body != nil {
data, err := parseData(step.Request.Body, step.Variables)
if err != nil {
return nil, err
}
v = append(v, data)
}
if step.Request.JSON != nil {
jsonData, err := parseData(step.Request.JSON, step.Variables)
if err != nil {
return nil, err
switch data.(type) {
case map[string]interface{}: // post json
v = append(v, req.BodyJSON(data))
default: // post raw data
v = append(v, data)
}
v = append(v, req.BodyJSON(jsonData))
}
for cookieName, cookieValue := range step.Request.Cookies {
@@ -158,6 +156,7 @@ func (r *Runner) runStepRequest(step *TStep) (stepData *StepData, err error) {
// do request action
req.Debug = r.debug
// r.client.SetProxyUrl("http://127.0.0.1:8888")
resp, err := r.client.Do(string(step.Request.Method), step.Request.URL, v...)
if err != nil {
return