GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-27 11:10:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
lilong.129
2024-08-27 20:14:33 +08:00
parent 41d4ac4a43 5856652b30
commit 67eecb405c
34 changed files with 2027 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hrp/step_mobile_ui.go
View File

@@ -605,18 +605,18 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err
}
// report GA event
sdk.SendGA4Event("hrp_run_ui", map[string]interface{}{
go sdk.SendGA4Event("hrp_run_ui", map[string]interface{}{
"osType": osType,
})
identifer := mobileStep.Identifier
if mobileStep.Options != nil && identifer == "" {
identifer = mobileStep.Options.Identifier
identifier := mobileStep.Identifier
if mobileStep.Options != nil && identifier == "" {
identifier = mobileStep.Options.Identifier
}
if len(mobileStep.Actions) != 0 && identifer == "" {
if len(mobileStep.Actions) != 0 && identifier == "" {
for _, action := range mobileStep.Actions {
if action.Identifier != "" {
identifer = action.Identifier
identifier = action.Identifier
break
}
}
@@ -624,7 +624,7 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err
stepResult = &StepResult{
Name: step.Name,
Identifier: identifer,
Identifier: identifier,
StepType: StepType(osType),
Success: false,
ContentSize: 0,
@@ -650,8 +650,10 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err
}
// automatic handling of pop-up windows on each step finished
if err2 := uiDriver.ClosePopupsHandler(); err2 != nil {
log.Error().Err(err2).Str("step", step.Name).Msg("handle popup failed on step finished")
if !step.IgnorePopup && !s.IgnorePopup() {
if err2 := uiDriver.ClosePopups(); err2 != nil {
log.Error().Err(err2).Str("step", step.Name).Msg("auto handle popup failed")
}
}
// save attachments