From abbd3fb20536fdaf6d607f9c0ee2889a0704fc98 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Fri, 2 Sep 2022 08:54:09 +0800 Subject: [PATCH] fix: marshal yaml with inline tag --- examples/uitest/demo_weixin_live.yaml | 49 +++++++++++++++++++++++++++ hrp/step_ios_ui.go | 6 ++-- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 examples/uitest/demo_weixin_live.yaml diff --git a/examples/uitest/demo_weixin_live.yaml b/examples/uitest/demo_weixin_live.yaml new file mode 100644 index 00000000..d5f3d795 --- /dev/null +++ b/examples/uitest/demo_weixin_live.yaml @@ -0,0 +1,49 @@ +config: + name: 通过 feed 卡片进入微信直播间 +teststeps: + - name: 启动微信 + ios: + actions: + - method: home + - method: app_terminate + params: com.tencent.xin + - method: swipe_to_tap_app + params: 微信 + max_retry_times: 5 + validate: + - check: ui_label + assert: exists + expect: 通讯录 + msg: 微信启动失败,「通讯录」不存在 + - name: 进入直播页 + ios: + actions: + - method: tap + params: 发现 + - method: tap_ocr + params: 视频号 + - name: 处理青少年弹窗 + ios: + actions: + - method: tap_ocr + params: 我知道了 + ignore_NotFoundError: true + - name: 在推荐页上划,直到出现「轻触进入直播间」 + ios: + actions: + - method: swipe_to_tap_text + params: 轻触进入直播间 + max_retry_times: 10 + - name: 向上滑动,等待 10s + ios: + actions: + - method: swipe + params: up + - method: sleep + params: 10 + - method: screenshot + - method: swipe + params: up + - method: sleep + params: 10 + - method: screenshot diff --git a/hrp/step_ios_ui.go b/hrp/step_ios_ui.go index d8cf5382..ca5013e9 100644 --- a/hrp/step_ios_ui.go +++ b/hrp/step_ios_ui.go @@ -23,9 +23,9 @@ type WDADevice struct { } type IOSStep struct { - WDADevice - MobileAction - Actions []MobileAction `json:"actions,omitempty" yaml:"actions,omitempty"` + WDADevice `yaml:",inline"` // inline refers to https://pkg.go.dev/gopkg.in/yaml.v3#Marshal + MobileAction `yaml:",inline"` + Actions []MobileAction `json:"actions,omitempty" yaml:"actions,omitempty"` } // StepIOS implements IStep interface.