mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 15:37:35 +08:00
fix: resolve conflicts
This commit is contained in:
@@ -375,6 +375,7 @@ func convertCompatMobileStep(mobileStep *MobileStep) {
|
||||
if ma.Method == uixt.ACTION_TapByCV {
|
||||
uiTypes, _ := builtin.ConvertToStringSlice(ma.Params)
|
||||
ma.ActionOptions.ScreenShotWithUITypes = append(ma.ActionOptions.ScreenShotWithUITypes, uiTypes...)
|
||||
ma.ActionOptions.ScreenShotWithUpload = true
|
||||
}
|
||||
// set default max_retry_times to 10 for swipe_to_tap_texts
|
||||
if ma.Method == uixt.ACTION_SwipeToTapTexts && actionOptions.MaxRetryTimes == 0 {
|
||||
@@ -384,6 +385,9 @@ func convertCompatMobileStep(mobileStep *MobileStep) {
|
||||
if ma.Method == uixt.ACTION_SwipeToTapText && actionOptions.MaxRetryTimes == 0 {
|
||||
ma.ActionOptions.MaxRetryTimes = 10
|
||||
}
|
||||
if ma.Method == uixt.ACTION_Swipe {
|
||||
ma.ActionOptions.Direction = ma.Params
|
||||
}
|
||||
mobileStep.Actions[i] = ma
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user