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

refactor: move action options to pkg/uixt/options/action

Browse Source
This commit is contained in:
lilong.129
2025-02-06 16:42:16 +08:00
parent f1ef161377
commit 0accec04a9
43 changed files with 982 additions and 911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/model.go
View File

@@ -1,6 +1,8 @@
package server
import "github.com/httprunner/httprunner/v5/pkg/uixt"
import (
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
)
type HttpResponse struct {
Code int `json:"code"`
@@ -13,7 +15,7 @@ type TapRequest struct {
Y float64 `json:"y"`
Text string `json:"text"`
Options *uixt.ActionOptions `json:"options,omitempty"`
Options *options.ActionOptions `json:"options,omitempty"`
}
type DragRequest struct {
@@ -22,7 +24,7 @@ type DragRequest struct {
ToX float64 `json:"to_x"`
ToY float64 `json:"to_y"`
Options *uixt.ActionOptions `json:"options,omitempty"`
Options *options.ActionOptions `json:"options,omitempty"`
}
type InputRequest struct {
@@ -31,7 +33,7 @@ type InputRequest struct {
}
type ScreenRequest struct {
Options *uixt.ActionOptions `json:"options,omitempty"`
Options *options.ActionOptions `json:"options,omitempty"`
}
type KeycodeRequest struct {

3
server/source.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
"github.com/rs/zerolog/log"
)
@@ -51,7 +52,7 @@ func screenResultHandler(c *gin.Context) {
return
}
var actionOptions []uixt.ActionOption
var actionOptions []options.ActionOption
if screenReq.Options != nil {
actionOptions = screenReq.Options.Options()
}

9
server/ui.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/code"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/options"
"github.com/rs/zerolog/log"
)
@@ -22,7 +22,7 @@ func tapHandler(c *gin.Context) {
return
}
var actionOptions []uixt.ActionOption
var actionOptions []options.ActionOption
if tapReq.Options != nil {
actionOptions = tapReq.Options.Options()
}
@@ -82,7 +82,7 @@ func dragHandler(c *gin.Context) {
return
}
var actionOptions []uixt.ActionOption
var actionOptions []options.ActionOption
if dragReq.Options != nil {
actionOptions = dragReq.Options.Options()
}
@@ -139,7 +139,8 @@ func inputHandler(c *gin.Context) {
return
}
err = dExt.Driver.SendKeys(inputReq.Text, uixt.WithFrequency(inputReq.Frequency))
err = dExt.Driver.SendKeys(inputReq.Text,
options.WithFrequency(inputReq.Frequency))
if err != nil {
log.Err(err).Msg(fmt.Sprintf("[%s]: failed to input text %s", c.HandlerName(), inputReq.Text))
c.JSON(http.StatusInternalServerError,