Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zentaoatf
提交
b613c889
Z
zentaoatf
项目概览
易企天创
/
zentaoatf
大约 1 年 前同步成功
通知
11
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
3
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zentaoatf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
3
Issue
3
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b613c889
编写于
5月 19, 2023
作者:
Z
zhaoke
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix unit test issue.
上级
d0671ee4
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
21 addition
and
17 deletion
+21
-17
Jenkinsfile
Jenkinsfile
+1
-1
internal/pkg/helper/exec/report-unit.go
internal/pkg/helper/exec/report-unit.go
+3
-2
test/helper/zentao/ui/zentao.go
test/helper/zentao/ui/zentao.go
+1
-1
test/ui/helper/action.go
test/ui/helper/action.go
+4
-4
test/ui/ui_run_statistic_test.go
test/ui/ui_run_statistic_test.go
+1
-2
test/ui/ui_run_test.go
test/ui/ui_run_test.go
+3
-3
test/ui/ui_workspace_test.go
test/ui/ui_workspace_test.go
+8
-3
test/ui/utils/print.go
test/ui/utils/print.go
+0
-1
未找到文件。
Jenkinsfile
浏览文件 @
b613c889
...
...
@@ -47,7 +47,7 @@ pipeline {
steps
{
container
(
'playwright'
)
{
// sh "sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories"
sh
"apt install -y make git gcc libc-dev"
sh
"apt install -y make git gcc libc-dev
php maven
"
sh
'go mod download'
// sh 'go install -a -v github.com/go-bindata/go-bindata/...@latest'
sh
'go-bindata -o=res/res.go -pkg=res res/...'
...
...
internal/pkg/helper/exec/report-unit.go
浏览文件 @
b613c889
...
...
@@ -838,8 +838,9 @@ func getCaseIdFromName(cs *commDomain.UnitResult, defaultVal int) {
cs
.
Title
=
arr
[
0
][
2
]
}
if
cs
.
Cid
<=
0
{
cs
.
Cid
=
defaultVal
cs
.
Id
=
cs
.
Cid
if
cs
.
Id
<=
0
{
cs
.
Id
=
defaultVal
}
return
...
...
test/helper/zentao/ui/zentao.go
浏览文件 @
b613c889
...
...
@@ -292,7 +292,7 @@ func CheckUnitTestResult() bool {
if
result
[
"title"
]
==
"loginFail"
&&
result
[
"status"
]
!=
"通过"
{
return
false
}
if
result
[
"title"
]
==
"loginSuccess"
&&
result
[
"status"
]
!=
"
通过
"
{
if
result
[
"title"
]
==
"loginSuccess"
&&
result
[
"status"
]
!=
"
失败
"
{
return
false
}
}
...
...
test/ui/helper/action.go
浏览文件 @
b613c889
...
...
@@ -137,9 +137,9 @@ func (p *Webpage) WaitForTimeout(timeout float64) {
return
}
func
(
p
*
Webpage
)
Click
(
selector
string
,
options
...
playwright
.
PageClickOptions
)
{
func
(
p
*
Webpage
)
Click
(
selector
string
)
{
t
:=
p
.
T
err
:=
p
.
Page
.
Click
(
selector
,
options
...
)
err
:=
p
.
Page
.
Click
(
selector
,
playwright
.
PageClickOptions
{
Timeout
:
&
conf
.
Timeout
}
)
if
err
!=
nil
{
p
.
ScreenShot
()
err
=
errors
.
New
(
fmt
.
Sprintf
(
"Click %s fail: %s"
,
selector
,
err
.
Error
()))
...
...
@@ -161,7 +161,7 @@ func (p *Webpage) Check(selector string, options ...playwright.FrameCheckOptions
func
(
p
*
Webpage
)
RightClick
(
selector
string
)
{
t
:=
p
.
T
err
:=
p
.
Page
.
Click
(
selector
,
playwright
.
PageClickOptions
{
Button
:
playwright
.
MouseButtonRight
})
err
:=
p
.
Page
.
Click
(
selector
,
playwright
.
PageClickOptions
{
Button
:
playwright
.
MouseButtonRight
,
Timeout
:
&
conf
.
Timeout
})
if
err
!=
nil
{
p
.
ScreenShot
()
err
=
errors
.
New
(
fmt
.
Sprintf
(
"Rigth click %s fail: %s"
,
selector
,
err
.
Error
()))
...
...
@@ -212,6 +212,6 @@ func (p *Webpage) ScreenShot() {
}
func
(
p
*
Webpage
)
WaitForResponse
(
url
string
)
(
resp
playwright
.
Response
)
{
resp
=
p
.
Page
.
WaitForResponse
(
url
,
playwright
.
PageWaitForResponseOptions
{
Timeout
:
playwright
.
Float
(
3000
)
})
resp
=
p
.
Page
.
WaitForResponse
(
url
,
playwright
.
PageWaitForResponseOptions
{
Timeout
:
&
conf
.
Timeout
})
return
}
test/ui/ui_run_statistic_test.go
浏览文件 @
b613c889
...
...
@@ -97,8 +97,7 @@ func RunBugStatistic(t provider.T) {
ztfTestHelper
.
ExpandWorspace
(
webpage
)
scriptLocator
:=
webpage
.
Locator
(
".tree-node-title>>text=1_string_match.php"
)
scriptLocator
.
Click
()
scriptLocator
.
Click
()
webpage
.
WaitForResponse
(
"**/statistic*"
)
webpage
.
WaitForSelector
(
"#mainContent:has-text('执行统计')"
)
webpage
.
WaitForTimeout
(
1000
)
elements
:=
webpage
.
QuerySelectorAll
(
".statistic>>span"
)
bugTimes
:=
elements
.
InnerText
(
3
)
...
...
test/ui/ui_run_test.go
浏览文件 @
b613c889
...
...
@@ -262,7 +262,7 @@ func RunDir(t provider.T) {
defer
webpage
.
Close
()
ztfTestHelper
.
SelectSite
(
webpage
)
ztfTestHelper
.
ExpandWorspace
(
webpage
)
webpage
.
Click
(
".tree-node-children>>.tree-node>>:has-text('testdir')"
,
playwright
.
PageClickOptions
{
Button
:
playwright
.
MouseButtonRight
}
)
webpage
.
RightClick
(
".tree-node-children>>.tree-node>>:has-text('testdir')"
)
webpage
.
Click
(
".tree-context-menu>>text=执行"
)
webpage
.
WaitForSelector
(
"#log-list>>.msg-span>>:has-text('执行1个用例,耗时')"
)
innerText
:=
webpage
.
InnerText
(
"#log-list>>.msg-span>>:has-text('执行1个用例,耗时')"
)
...
...
@@ -332,8 +332,8 @@ func RunUnit(t provider.T) {
locator
=
webpage
.
Locator
(
"#log-list>>code:has-text('执行3个用例,耗时')"
)
innerText
:=
locator
.
InnerText
()
if
!
strings
.
Contains
(
innerText
,
"通过数:
3(100.0%),失败数:0(0
.0%)"
)
{
t
.
Errorf
(
"Exec testng fail
"
)
if
!
strings
.
Contains
(
innerText
,
"通过数:
2(66.0%),失败数:1(33
.0%)"
)
{
t
.
Errorf
(
"Exec testng fail
, result:"
+
innerText
)
t
.
FailNow
()
}
webpage
.
WaitForSelector
(
"#rightPane>>.result-list-item>>nth=0>>.list-item-title:has-text('testng工作目录(3)')"
)
...
...
test/ui/ui_workspace_test.go
浏览文件 @
b613c889
...
...
@@ -50,6 +50,8 @@ func SyncFromZentao(t provider.T) {
plwConf
.
EnableErr
()
locator
.
RightClick
()
webpage
.
Click
(
".tree-context-menu>>text=从禅道同步"
)
locator
=
webpage
.
Locator
(
"#syncFromZentaoFormModal select"
)
locator
.
SelectNth
(
2
,
playwright
.
SelectOptionValues
{
Labels
:
&
[]
string
{
"企业网站第一期测试任务"
}})
webpage
.
WaitForSelector
(
"#syncFromZentaoFormModal .z-tbody-checkbox"
)
webpage
.
Click
(
"#syncFromZentaoFormModal>>.modal-action>>span:has-text(
\"
确定
\"
)"
)
webpage
.
WaitForSelector
(
"#syncFromZentaoFormModal"
,
playwright
.
PageWaitForSelectorOptions
{
State
:
playwright
.
WaitForSelectorStateHidden
})
...
...
@@ -62,14 +64,17 @@ func SyncTwoCaseFromZentao(t provider.T) {
webpage
,
_
:=
plwHelper
.
OpenUrl
(
constTestHelper
.
ZtfUrl
,
t
)
defer
webpage
.
Close
()
ztfTestHelper
.
SelectSite
(
webpage
)
var
waitTimeOut
float64
=
5000
webpage
.
WaitForSelector
(
".tree-node"
,
playwright
.
PageWaitForSelectorOptions
{
Timeout
:
&
waitTimeOut
})
webpage
.
WaitForSelector
(
".tree-node"
,
playwright
.
PageWaitForSelectorOptions
{
Timeout
:
&
plwConf
.
Timeout
})
locator
:=
webpage
.
Locator
(
".tree-node"
,
playwright
.
PageLocatorOptions
{
HasText
:
"单元测试工作目录"
})
locator
.
RightClick
()
webpage
.
ScreenShot
()
webpage
.
Click
(
".tree-context-menu>>text=从禅道同步"
)
webpage
.
ScreenShot
()
locator
=
webpage
.
Locator
(
"#syncFromZentaoFormModal select"
)
locator
.
SelectNth
(
2
,
playwright
.
SelectOptionValues
{
Labels
:
&
[]
string
{
"企业网站第一期测试任务"
}})
webpage
.
WaitForSelector
(
"#syncFromZentaoFormModal .z-tbody-checkbox"
)
webpage
.
Click
(
"text=编号标题类型状态结果 >> input[type=
\"
checkbox
\"
]"
)
webpage
.
Click
(
"text=1check string matches pattern功能测试
正常
>> input[type=
\"
checkbox
\"
]"
)
webpage
.
Click
(
"text=1check string matches pattern功能测试 >> input[type=
\"
checkbox
\"
]"
)
webpage
.
Click
(
"text=2extract content from webpage功能测试 >> input[type=
\"
checkbox
\"
]"
)
webpage
.
Click
(
"#syncFromZentaoFormModal>>.modal-action>>span:has-text(
\"
确定
\"
)"
)
webpage
.
WaitForSelector
(
"#syncFromZentaoFormModal"
,
playwright
.
PageWaitForSelectorOptions
{
State
:
playwright
.
WaitForSelectorStateHidden
})
...
...
test/ui/utils/print.go
浏览文件 @
b613c889
...
...
@@ -9,7 +9,6 @@ import (
func
PrintErrOrNot
(
err
error
,
t
provider
.
T
)
{
if
err
!=
nil
&&
t
!=
nil
{
// fmt.Println(err)
if
conf
.
ExitAllOnError
{
t
.
Error
(
err
)
t
.
FailNow
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录