提交 a938f42d 编写于 作者: Z zhaoke

Adjust unit test.

上级 90827358
......@@ -105,12 +105,6 @@ pipeline {
}
steps {
container('golang') {
sh 'git config --global --add safe.directory $(pwd)'
sh 'CGO_ENABLED=0 make compile_command_linux'
sh 'cd bin/linux && tar zcf ${WORKSPACE}/ztf.linux.tar.gz ztf'
}
nexusArtifactUploader(
nexusVersion: 'nexus3',
protocol: env.ARTIFACT_PROTOCOL,
......@@ -152,11 +146,22 @@ pipeline {
sh 'apachectl start'
sh 'env'
}
container('golang') {
sh 'git config --global --add safe.directory $(pwd)'
sh 'CGO_ENABLED=0 make compile_command_linux'
sh 'cp bin/linux/ztf ./'
sh 'cd bin/linux && tar zcf ${WORKSPACE}/ztf.linux.tar.gz ztf'
}
container('golang') {
sh 'nohup go run cmd/server/main.go &'
}
container('node') {
sh 'cd ui && npm i && npm run serve'
sh 'cd ui && yarn && nohup yarn serve &'
}
container('golang') {
sh 'CGO_ENABLED=0 go run cmd/cli/main.go'
sh 'CGO_ENABLED=0 go run cmd/ui/main.go'
sh 'CGO_ENABLED=0 go test $(go list ./... | grep -v /test/ui | grep -v /test/cli | grep -v /test/helper)'
}
}
}
......
......@@ -30,7 +30,7 @@ func Spawn(cmdStr string, timeout time.Duration) (expect *GExpect, err error) {
cmdStr = strings.ReplaceAll(cmdStr, "/", "\\")
cmd = exec.Command("cmd", "/C", cmdStr)
} else {
cmd = exec.Command("/bin/bash", "-c", cmdStr)
cmd = exec.Command("/bin/sh", "-c", cmdStr)
}
fmt.Println(cmd.String())
......
......@@ -20,7 +20,8 @@ func main() {
serverConfig.InitExecLog(constTestHelper.RootPath)
commConsts.ZtfDir = constTestHelper.RootPath
i118Utils.Init("zh-CN", commConsts.AppServer)
var version = flag.String("zentaoVersion", "", "")
var version = flag.String("zentaoVersion", "", "latest")
var runFrom = flag.String("runFrom", "", "cmd")
testing.Init()
flag.Parse()
fmt.Println(*version)
......@@ -28,17 +29,20 @@ func main() {
execHelper.KillProcessByUUID("ui_auto_test")
uiTest.Close()
}()
err := commonTestHelper.InitZentao(*version)
if err != nil {
fmt.Println("Init zentao data fail ", err)
}
// err = constTestHelper.Pull()
// if err != nil {
// fmt.Println("Git pull code fail ", err)
// }
err = commonTestHelper.BuildCli()
if err != nil {
fmt.Println("Build cli fail ", err)
if *runFrom == "jenkins" {
err := commonTestHelper.InitZentaoData()
if err != nil {
fmt.Println("Init zentao data fail ", err)
}
} else {
err := commonTestHelper.InitZentao(*version)
if err != nil {
fmt.Println("Init zentao data fail ", err)
}
err = commonTestHelper.BuildCli()
if err != nil {
fmt.Println("Build cli fail ", err)
}
}
commonTestHelper.TestCli()
}
......@@ -125,6 +125,11 @@ func InitZentao(version string) (err error) {
return
}
func InitZentaoData() (err error) {
err = uiTest.InitZentaoData("latest", "")
return
}
func waitZentaoAccessed() {
isTimeout := false
time.AfterFunc(20*time.Second, func() {
......
......@@ -102,7 +102,7 @@ func waitZtfAccessed() {
isTimeout = true
})
for {
status := uiTest.GetStatus("http://127.0.0.1:8000/")
status := uiTest.GetStatus(constTestHelper.ZtfUrl)
if isTimeout || status {
return
}
......
......@@ -13,7 +13,8 @@ const (
var (
NewLine = "\n"
RootPath = ""
ZentaoSiteUrl = "http://127.0.0.1:8081"
ZentaoSiteUrl = "http://127.0.0.1:80"
ZtfUrl = "http://127.0.0.1:8000/"
)
func init() {
......
......@@ -30,6 +30,10 @@ func Login(url string) (err error) {
WaitUntil: playwright.WaitUntilStateDomcontentloaded}); err != nil {
return
}
title, _ := page.Title()
if !strings.Contains(title, "用户登录") {
return
}
err = page.Fill(`input[name="account"]`, "admin")
if err != nil {
return
......@@ -46,7 +50,7 @@ func Login(url string) (err error) {
if err != nil {
return
}
title, err := page.Title()
title, err = page.Title()
if err != nil {
return
}
......@@ -380,7 +384,7 @@ func InitZentaoData(version string, codeDir string) (err error) {
if err != nil {
return
}
err = page.Fill(`input[name="dbPassword"]`, "123456")
err = page.Fill(`input[name="dbPassword"]`, "pass4Zentao")
if err != nil {
return
}
......@@ -476,6 +480,9 @@ func InitZentaoData(version string, codeDir string) (err error) {
if err != nil {
return
}
if codeDir == "" {
return
}
err = InstallExt(version, codeDir)
if err != nil {
return
......
......@@ -3,6 +3,6 @@ package conf
var (
ExitAllOnError = true
ShowErr = true
Headless = true
Headless = false
Timeout float64 = 5000
)
......@@ -25,6 +25,8 @@ func OpenUrl(url string, t provider.T) (ret Webpage, err error) {
utils.PrintErrOrNot(err, t)
if _, err = page.Goto(url, playwright.PageGotoOptions{WaitUntil: playwright.WaitUntilStateDomcontentloaded}); err != nil {
page.Close()
browser.Close()
utils.PrintErrOrNot(err, t)
}
......
......@@ -20,7 +20,8 @@ func main() {
serverConfig.InitExecLog(constTestHelper.RootPath)
commConsts.ZtfDir = constTestHelper.RootPath
i118Utils.Init("zh-CN", commConsts.AppServer)
var version = flag.String("zentaoVersion", "", "")
var version = flag.String("zentaoVersion", "", "latest")
var runFrom = flag.String("runFrom", "", "cmd")
testing.Init()
flag.Parse()
fmt.Println(*version)
......@@ -29,25 +30,29 @@ func main() {
uiTest.Close()
}()
err := commonTestHelper.InitZentao(*version)
if err != nil {
fmt.Println("Init zentao data fail ", err)
}
// err = commonTestHelper.Pull()
// if err != nil {
// fmt.Println("Git pull code fail ", err)
// }
err = commonTestHelper.BuildCli()
if err != nil {
fmt.Println("Build cli fail ", err)
}
err = commonTestHelper.RunServer()
if err != nil {
fmt.Println("Build server fail ")
}
err = commonTestHelper.RunUi()
if err != nil {
fmt.Println("Build server fail ")
if *runFrom == "jenkins" {
err := commonTestHelper.InitZentaoData()
if err != nil {
fmt.Println("Init zentao data fail ", err)
}
} else {
err := commonTestHelper.InitZentao(*version)
if err != nil {
fmt.Println("Init zentao data fail ", err)
}
err = commonTestHelper.BuildCli()
if err != nil {
fmt.Println("Build cli fail ", err)
}
err = commonTestHelper.RunServer()
if err != nil {
fmt.Println("Build server fail ")
}
err = commonTestHelper.RunUi()
if err != nil {
fmt.Println("Build server fail ")
}
}
commonTestHelper.TestUi()
}
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -16,7 +17,7 @@ func ScriptBug(t provider.T) {
t.ID("5747")
t.AddParentSuite("查看bug列表")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -41,7 +42,7 @@ func ScriptsBug(t provider.T) {
t.ID("5748")
t.AddParentSuite("查看bug列表")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
plwConf "github.com/easysoft/zentaoatf/test/ui/conf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -13,7 +14,7 @@ import (
func CreateInterpreter(t provider.T) {
t.ID("5744")
t.AddParentSuite("管理解析器")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.Click("#proxyTable>>tr:has-text('本地节点')>>button:has-text('运行环境')")
......@@ -43,7 +44,7 @@ func CreateInterpreter(t provider.T) {
func EditInterpreter(t provider.T) {
t.ID("5745")
t.AddParentSuite("管理解析器")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.Click("#proxyTable>>tr:has-text('本地节点')>>button:has-text('运行环境')")
......@@ -60,7 +61,7 @@ func EditInterpreter(t provider.T) {
func DeleteInterpreter(t provider.T) {
t.ID("5465")
t.AddParentSuite("管理解析器")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.Click("#proxyTable>>tr:has-text('本地节点')>>button:has-text('运行环境')")
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
"github.com/ozontech/allure-go/pkg/framework/runner"
......@@ -11,7 +12,7 @@ import (
func SwitchLanguage(t provider.T) {
t.ID("5464")
t.AddParentSuite("设置界面语言")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.Click(`input[type="radio"]>>nth=1`)
......
......@@ -9,12 +9,13 @@ import (
"github.com/ozontech/allure-go/pkg/framework/provider"
"github.com/ozontech/allure-go/pkg/framework/runner"
playwright "github.com/playwright-community/playwright-go"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
)
func CollapseLog(t provider.T) {
t.ID("5502")
t.AddParentSuite("脚本执行日志")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -39,7 +40,7 @@ func CollapseLog(t provider.T) {
func FullScreenLog(t provider.T) {
t.ID("5749")
t.AddParentSuite("脚本执行日志")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.WaitForSelector(".tree-node")
locator := webpage.Locator(".tree-node", playwright.PageLocatorOptions{HasText: "单元测试工作目录"})
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -12,7 +13,7 @@ import (
func SwitchProduct(t provider.T) {
t.ID("5496")
t.AddParentSuite("切换禅道产品")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.ExpandWorspace(webpage)
webpage.Click("#productMenuToggle")
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
plwConf "github.com/easysoft/zentaoatf/test/ui/conf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -13,7 +14,7 @@ import (
func CreateProxy(t provider.T) {
t.ID("5740")
t.AddParentSuite("设置界面语言")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.WaitForSelector("#settingModal .z-tbody-tr:has-text('本地节点')")
......@@ -45,7 +46,7 @@ func CreateProxy(t provider.T) {
func EditProxy(t provider.T) {
t.ID("5741")
t.AddParentSuite("设置界面语言")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.WaitForSelectorTimeout("#proxyTable", 5000)
......@@ -63,7 +64,7 @@ func EditProxy(t provider.T) {
func DeleteProxy(t provider.T) {
t.ID("5742")
t.AddParentSuite("设置界面语言")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.WaitForSelectorTimeout("#proxyTable", 5000)
......
......@@ -4,6 +4,7 @@ import (
"strings"
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTest "github.com/easysoft/zentaoatf/test/helper/ztf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
......@@ -15,7 +16,7 @@ import (
func Detail(t provider.T) {
t.ID("5489")
t.AddParentSuite("测试结果")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTest.SelectSite(webpage)
ztfTest.ExpandWorspace(webpage)
......@@ -45,7 +46,7 @@ func Detail(t provider.T) {
func SubmitResult(t provider.T) {
t.ID("5499")
t.AddParentSuite("测试结果")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
webpage.Click("#rightPane .result-list-item .list-item-title>>nth=0")
......@@ -62,7 +63,7 @@ func SubmitResult(t provider.T) {
func SubmitBug(t provider.T) {
t.ID("5500")
t.AddParentSuite("测试结果")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
webpage.Click("#rightPane .result-list-item .list-item-title>>nth=0")
......@@ -76,7 +77,7 @@ func SubmitBug(t provider.T) {
func SubmitBugTwoStep(t provider.T) {
t.ID("5500")
t.AddParentSuite("测试结果")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......
......@@ -4,6 +4,7 @@ import (
"strings"
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -13,7 +14,7 @@ import (
func RunReExecFailCase(t provider.T) {
t.ID("5491")
t.AddParentSuite("测试结果页面执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -48,7 +49,7 @@ func RunReExecFailCase(t provider.T) {
func RunReExecAllCase(t provider.T) {
t.ID("5750")
t.AddParentSuite("测试结果页面执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.ExpandWorspace(webpage)
ztfTestHelper.RunScript(webpage, "1_string_match.php")
......
......@@ -4,6 +4,7 @@ import (
"strconv"
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -17,7 +18,7 @@ func RunFailStatistic(t provider.T) {
t.ID("5487")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -53,7 +54,7 @@ func RunSuccessStatistic(t provider.T) {
t.ID("5487")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -90,7 +91,7 @@ func RunBugStatistic(t provider.T) {
t.ID("5487")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......
......@@ -7,6 +7,7 @@ import (
"testing"
commonTestHelper "github.com/easysoft/zentaoatf/test/helper/common"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
zentaoTestHelper "github.com/easysoft/zentaoatf/test/helper/zentao/ui"
ztfTest "github.com/easysoft/zentaoatf/test/helper/ztf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
......@@ -21,7 +22,7 @@ func RunScript(t provider.T) {
t.ID("5743")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -51,7 +52,7 @@ func RunScriptByRightClick(t provider.T) {
t.ID("5479")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -78,7 +79,7 @@ func RunNoInterpreterScript(t provider.T) {
t.ID("5501")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -92,7 +93,7 @@ func RunSelectedScripts(t provider.T) {
t.ID("5481")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -126,7 +127,7 @@ func RunOpenedAndLast(t provider.T) {
t.ID("5484")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -179,7 +180,7 @@ func RunAll(t provider.T) {
os.RemoveAll(commonTestHelper.GetZtfProductPath())
os.Remove(commonTestHelper.GetPhpWorkspacePath() + "1.php")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -214,7 +215,7 @@ func RunWorkspace(t provider.T) {
t.ID("5482")
t.AddParentSuite("右键执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -257,7 +258,7 @@ func RunDir(t provider.T) {
t.ID("5480")
t.AddParentSuite("右键执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -290,7 +291,7 @@ func RunUnit(t provider.T) {
t.ID("5432")
t.AddParentSuite("右键执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -370,7 +371,7 @@ func RunUseProxy(t provider.T) {
t.ID("5746")
t.AddParentSuite("执行脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -13,7 +14,7 @@ import (
func SaveScript(t provider.T) {
t.ID("5470")
t.AddParentSuite("禅道站点脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -42,7 +43,7 @@ func SaveScript(t provider.T) {
func ViewScript(t provider.T) {
t.ID("5469")
t.AddParentSuite("禅道站点脚本")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
plwConf "github.com/easysoft/zentaoatf/test/ui/conf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -13,7 +14,7 @@ import (
func CreateServer(t provider.T) {
t.ID("5737")
t.AddParentSuite("管理服务器")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.Click("text=新建服务器")
......@@ -30,7 +31,7 @@ func CreateServer(t provider.T) {
func EditServer(t provider.T) {
t.ID("5738")
t.AddParentSuite("管理服务器")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.WaitForSelector("#settingModal .z-tbody-tr:has-text('测试服务器')")
......@@ -47,7 +48,7 @@ func EditServer(t provider.T) {
func DeleteServer(t provider.T) {
t.ID("5739")
t.AddParentSuite("管理服务器")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
webpage.Click("#navbar>>[title=\"设置\"]")
webpage.WaitForSelector("#settingModal .z-tbody-tr:has-text('测试服务器')")
......
......@@ -14,7 +14,7 @@ import (
func CreateSite(t provider.T) {
t.ID("5466")
t.AddParentSuite("配置禅道站点")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
locator := webpage.Locator("#siteMenuToggle")
locator.Click()
......@@ -33,7 +33,7 @@ func CreateSite(t provider.T) {
func EditSite(t provider.T) {
t.ID("5466")
t.AddParentSuite("配置禅道站点")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
locator := webpage.Locator("#siteMenuToggle")
locator.Click()
......@@ -63,7 +63,7 @@ func EditSite(t provider.T) {
func DeleteSite(t provider.T) {
t.ID("5466")
t.AddParentSuite("配置禅道站点")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
locator := webpage.Locator("#siteMenuToggle")
locator.Click()
......
......@@ -3,6 +3,7 @@ package main
import (
"testing"
constTestHelper "github.com/easysoft/zentaoatf/test/helper/conf"
ztfTestHelper "github.com/easysoft/zentaoatf/test/helper/ztf"
plwHelper "github.com/easysoft/zentaoatf/test/ui/helper"
"github.com/ozontech/allure-go/pkg/framework/provider"
......@@ -12,7 +13,7 @@ import (
func FilterDir(t provider.T) {
t.ID("5494")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -29,7 +30,7 @@ func FilterDir(t provider.T) {
func FilterSuite(t provider.T) {
t.ID("5495")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.ExpandWorspace(webpage)
webpage.Click(`[title="筛选"]`)
......@@ -47,7 +48,7 @@ func FilterSuite(t provider.T) {
func ByModule(t provider.T) {
t.ID("5493")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.ExpandWorspace(webpage)
webpage.Click("#displayByMenuToggle")
......@@ -66,7 +67,7 @@ func ByModule(t provider.T) {
func FilterTask(t provider.T) {
t.ID("5496")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.ExpandWorspace(webpage)
webpage.Click(`[title="筛选"]`)
......
......@@ -21,7 +21,7 @@ var (
func CreateWorkspace(t provider.T) {
t.ID("5468")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
webpage.Click(`[title="新建工作目录"]`)
......@@ -42,7 +42,7 @@ func CreateWorkspace(t provider.T) {
func SyncFromZentao(t provider.T) {
t.ID("5751")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -59,7 +59,7 @@ func SyncFromZentao(t provider.T) {
func SyncTwoCaseFromZentao(t provider.T) {
t.ID("5752")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
var waitTimeOut float64 = 5000
......@@ -79,7 +79,7 @@ func SyncTwoCaseFromZentao(t provider.T) {
func SyncToZentao(t provider.T) {
t.ID("5431")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
var waitTimeOut float64 = 5000
......@@ -93,7 +93,7 @@ func SyncToZentao(t provider.T) {
func Copy(t provider.T) {
t.ID("5474")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandProduct(webpage)
......@@ -117,7 +117,7 @@ func Copy(t provider.T) {
func DeleteScript(t provider.T) {
t.ID("5478")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandProduct(webpage)
......@@ -140,7 +140,7 @@ func DeleteScript(t provider.T) {
func DeleteDir(t provider.T) {
t.ID("5477")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......@@ -163,7 +163,7 @@ func DeleteDir(t provider.T) {
func DeleteWorkspace(t provider.T) {
t.ID("5468")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
webpage.WaitForSelector(".tree-node")
......@@ -185,7 +185,7 @@ func DeleteWorkspace(t provider.T) {
func Clip(t provider.T) {
t.ID("5476")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
webpage.WaitForSelector(".tree-node")
......@@ -205,7 +205,7 @@ func Clip(t provider.T) {
func Collapse(t provider.T) {
t.ID("5472")
t.AddParentSuite("管理禅道站点下工作目录")
webpage, _ := plwHelper.OpenUrl("http://127.0.0.1:8000/", t)
webpage, _ := plwHelper.OpenUrl(constTestHelper.ZtfUrl, t)
defer webpage.Close()
ztfTestHelper.SelectSite(webpage)
ztfTestHelper.ExpandWorspace(webpage)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册