From 0bd621ad3ce47cd7dc167af3452e7cc34e5deca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=81=AA?= Date: Wed, 7 May 2025 20:15:50 +0800 Subject: [PATCH] fix: XTDriver --- go.mod | 4 +--- go.sum | 7 +------ internal/version/VERSION | 2 +- runner.go | 5 ++++- step_ui.go | 5 +++++ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 92c24478..dd685368 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,6 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/go-cmp v0.6.0 // indirect github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect github.com/google/uuid v1.6.0 // indirect github.com/goph/emperror v0.17.2 // indirect @@ -70,7 +69,6 @@ require ( github.com/hashicorp/go-plugin v1.4.10 // indirect github.com/hashicorp/yamux v0.1.1 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/incu6us/goimports-reviser/v2 v2.5.3 // indirect github.com/invopop/yaml v0.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect @@ -93,6 +91,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/quic-go/qtls-go1-20 v0.4.1 // indirect github.com/quic-go/quic-go v0.40.1-0.20231203135336-87ef8ec48d55 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f // indirect @@ -120,7 +119,6 @@ require ( google.golang.org/protobuf v1.34.1 // indirect gvisor.dev/gvisor v0.0.0-20240405191320-0878b34101b5 // indirect howett.net/plist v1.0.0 // indirect - mvdan.cc/gofumpt v0.8.0 // indirect software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect ) diff --git a/go.sum b/go.sum index efe4c8fd..86ab0411 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/incu6us/goimports-reviser/v2 v2.5.3 h1:DzvFl1+qOIDukqN8vMM/10MQswFQywUdwXxsjuowxlc= -github.com/incu6us/goimports-reviser/v2 v2.5.3/go.mod h1:P18aXhQaED7izHIP9IPI9PqEs7Y7D9okq71Q8Y8yHN4= github.com/invopop/yaml v0.1.0 h1:YW3WGUoJEXYfzWBjn00zIlrw7brGVD0fUKRYDPAPhrc= github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -239,9 +237,8 @@ github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= github.com/quic-go/quic-go v0.40.1-0.20231203135336-87ef8ec48d55 h1:I4N3ZRnkZPbDN935Tg8QDf8fRpHp3bZ0U0/L42jBgNE= github.com/quic-go/quic-go v0.40.1-0.20231203135336-87ef8ec48d55/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= @@ -393,8 +390,6 @@ gvisor.dev/gvisor v0.0.0-20240405191320-0878b34101b5 h1:DOUDfNS+CFMM46k18FRF5k/0 gvisor.dev/gvisor v0.0.0-20240405191320-0878b34101b5/go.mod h1:NQHVAzMwvZ+Qe3ElSiHmq9RUm1MdNHpUZ52fiEqvn+0= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= -mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k= -mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= software.sslmate.com/src/go-pkcs12 v0.2.0 h1:nlFkj7bTysH6VkC4fGphtjXRbezREPgrHuJG20hBGPE= software.sslmate.com/src/go-pkcs12 v0.2.0/go.mod h1:23rNcYsMabIc1otwLpTkCCPwUq6kQsTyowttG/as0kQ= diff --git a/internal/version/VERSION b/internal/version/VERSION index ad52154a..1c967846 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2505071715 +v5.0.0-beta-2505072021 diff --git a/runner.go b/runner.go index f6b0c565..4344d4fa 100644 --- a/runner.go +++ b/runner.go @@ -519,7 +519,10 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) { if err := driver.Setup(); err != nil { return nil, err } - driverExt := uixt.NewXTDriver(driver, aiOpts...) + driverExt, err := uixt.NewXTDriver(driver, aiOpts...) + if err != nil { + return nil, errors.Wrap(err, "init browser XTDriver failed") + } r.uixtDrivers[browserDeviceOptions.BrowserID] = driverExt } diff --git a/step_ui.go b/step_ui.go index 1d0c2c20..e2ec27f2 100644 --- a/step_ui.go +++ b/step_ui.go @@ -307,6 +307,7 @@ func (s *StepMobile) RightClick(x, y float64, options ...option.ActionOption) *S s.obj().Actions = append(s.obj().Actions, action) return s } + func (s *StepMobile) RightClickBySelector(selector string, options ...option.ActionOption) *StepMobile { action := uixt.MobileAction{ Method: uixt.ACTION_RightClickBySelector, @@ -316,6 +317,7 @@ func (s *StepMobile) RightClickBySelector(selector string, options ...option.Act s.obj().Actions = append(s.obj().Actions, action) return s } + func (s *StepMobile) HoverBySelector(selector string, options ...option.ActionOption) *StepMobile { action := uixt.MobileAction{ Method: uixt.ACTION_HoverBySelector, @@ -325,6 +327,7 @@ func (s *StepMobile) HoverBySelector(selector string, options ...option.ActionOp s.obj().Actions = append(s.obj().Actions, action) return s } + func (s *StepMobile) TapBySelector(selector string, options ...option.ActionOption) *StepMobile { action := uixt.MobileAction{ Method: uixt.ACTION_TapBySelector, @@ -334,6 +337,7 @@ func (s *StepMobile) TapBySelector(selector string, options ...option.ActionOpti s.obj().Actions = append(s.obj().Actions, action) return s } + func (s *StepMobile) ClosePage(idx int, options ...option.ActionOption) *StepMobile { action := uixt.MobileAction{ Method: uixt.ACTION_ClosePage, @@ -343,6 +347,7 @@ func (s *StepMobile) ClosePage(idx int, options ...option.ActionOption) *StepMob s.obj().Actions = append(s.obj().Actions, action) return s } + func (s *StepMobile) GetElementTextBySelector(selector string, options ...option.ActionOption) *StepMobile { action := uixt.MobileAction{ Method: uixt.ACTION_GetElementTextBySelector,