From ba5bb658c0a2854e3f313481f74a2b9ba6b3fce2 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Wed, 11 Jan 2023 14:03:00 +0800 Subject: [PATCH] Fix issue --- test/ui/helper/action.go | 6 ++---- test/ui/ui_bug_test.go | 2 +- test/ui/ui_run_statistic_test.go | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/ui/helper/action.go b/test/ui/helper/action.go index f8e66424..9294b95f 100644 --- a/test/ui/helper/action.go +++ b/test/ui/helper/action.go @@ -3,7 +3,6 @@ package plw import ( "errors" "fmt" - "regexp" "time" constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf" @@ -207,8 +206,7 @@ func (p *Webpage) ScreenShot() { p.Page.Screenshot(playwright.PageScreenshotOptions{Path: &screenshotPath}) } -func (p *Webpage) WaitForResponse(regx string) (resp playwright.Response) { - re := regexp.MustCompile(regx) - resp = p.Page.WaitForResponse(re) +func (p *Webpage) WaitForResponse(url string) (resp playwright.Response) { + resp = p.Page.WaitForResponse(url, playwright.PageWaitForResponseOptions{Timeout: playwright.Float(3000)}) return } diff --git a/test/ui/ui_bug_test.go b/test/ui/ui_bug_test.go index 92ed795b..f5f75579 100644 --- a/test/ui/ui_bug_test.go +++ b/test/ui/ui_bug_test.go @@ -23,7 +23,7 @@ func ScriptBug(t provider.T) { ztfTestHelper.RunScript(webpage, "1_string_match.php") ztfTestHelper.SubmitResult(webpage) webpage.Click(".tree-node-title:has-text('1_string_match.php')") - webpage.WaitForResponse(".*/bugs") + webpage.WaitForResponse("**/bugs") webpage.WaitForSelectorTimeout(".statistic>>span>>nth=3", 3000) webpage.Click(".statistic>>span>>nth=3") webpage.WaitForSelectorTimeout("#bugsModal>>tr", 3000) diff --git a/test/ui/ui_run_statistic_test.go b/test/ui/ui_run_statistic_test.go index 4acbce3a..3bd99876 100644 --- a/test/ui/ui_run_statistic_test.go +++ b/test/ui/ui_run_statistic_test.go @@ -30,7 +30,7 @@ func RunFailStatistic(t provider.T) { failTimesInt, _ := strconv.Atoi(failTimes) webpage.Click(".tabs-nav-toolbar>>[title=\"Run\"]") webpage.WaitForSelector("#log-list>>.msg-span>>:has-text('执行1个用例，耗时')") - webpage.WaitForResponse(".*/statistic") + webpage.WaitForResponse("**/statistic") webpage.WaitForTimeout(1000) elements = webpage.QuerySelectorAll(".statistic>>span") runTimes2 := elements.InnerText(0) @@ -66,7 +66,7 @@ func RunSuccessStatistic(t provider.T) { succTimesInt, _ := strconv.Atoi(succTimes) webpage.Click(".tabs-nav-toolbar>>[title=\"Run\"]") webpage.WaitForSelector("#log-list>>.msg-span>>:has-text('执行1个用例，耗时')") - webpage.WaitForResponse(".*/statistic") + webpage.WaitForResponse("**/statistic") webpage.WaitForTimeout(1000) elements = webpage.QuerySelectorAll(".statistic>>span") runTimes2 := elements.InnerText(0) @@ -96,7 +96,7 @@ func RunBugStatistic(t provider.T) { ztfTestHelper.ExpandWorspace(webpage) scriptLocator := webpage.Locator(".tree-node-title>>text=1_string_match.php") scriptLocator.Click() - webpage.WaitForResponse(".*/statistic") + webpage.WaitForResponse("**/statistic") webpage.WaitForTimeout(1000) elements := webpage.QuerySelectorAll(".statistic>>span") bugTimes := elements.InnerText(3) -- GitLab