Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
82394ba8
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
706
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
82394ba8
编写于
3月 20, 2022
作者:
X
xiangzihao
提交者:
GitHub
3月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Feature-9021][E2E] Recover sub_process e2e test in ui-next (#9023)
上级
fd5e79bd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
60 addition
and
54 deletion
+60
-54
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
...rg/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
+50
-50
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
...ler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
+9
-3
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/SubWorkflowTaskForm.java
.../e2e/pages/project/workflow/task/SubWorkflowTaskForm.java
+1
-1
未找到文件。
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowE2ETest.java
浏览文件 @
82394ba8
...
...
@@ -80,24 +80,24 @@ class WorkflowE2ETest {
;
}
//
@AfterAll
//
public static void cleanup() {
//
new NavBarPage(browser)
//
.goToNav(ProjectPage.class)
//
.goTo(project)
//
.goToTab(WorkflowDefinitionTab.class)
//
.cancelPublishAll()
//
.deleteAll()
//
;
//
//
new NavBarPage(browser)
//
.goToNav(ProjectPage.class)
//
.delete(project)
//
.goToNav(SecurityPage.class)
//
.goToTab(TenantPage.class)
//
.delete(tenant)
//
;
//
}
@AfterAll
public
static
void
cleanup
()
{
new
NavBarPage
(
browser
)
.
goToNav
(
ProjectPage
.
class
)
.
goTo
(
project
)
.
goToTab
(
WorkflowDefinitionTab
.
class
)
.
cancelPublishAll
()
.
deleteAll
()
;
new
NavBarPage
(
browser
)
.
goToNav
(
ProjectPage
.
class
)
.
delete
(
project
)
.
goToNav
(
SecurityPage
.
class
)
.
goToTab
(
TenantPage
.
class
)
.
delete
(
tenant
)
;
}
@Test
@Order
(
1
)
...
...
@@ -134,38 +134,38 @@ class WorkflowE2ETest {
workflowDefinitionPage
.
publish
(
workflow
);
}
//
@Test
//
@Order(10)
//
void testCreateSubWorkflow() {
//
final String workflow = "test-sub-workflow-1";
//
//
WorkflowDefinitionTab workflowDefinitionPage =
//
new ProjectPage(browser)
//
.goToNav(ProjectPage.class)
//
.goTo(project)
//
.goToTab(WorkflowDefinitionTab.class);
//
//
workflowDefinitionPage
//
.createWorkflow()
//
//
.<SubWorkflowTaskForm> addTask(TaskType.SUB_PROCESS)
//
.childNode("test-workflow-1")
//
.name("test-sub-1")
//
.submit()
//
//
.submit()
//
.name(workflow)
//
.tenant(tenant)
//
.addGlobalParam("global_param", "hello world")
//
.submit()
//
;
//
//
await().untilAsserted(() -> assertThat(
//
workflowDefinitionPage.workflowList()
//
).anyMatch(it -> it.getText().contains(workflow)));
//
//
workflowDefinitionPage.publish(workflow);
//
}
@Test
@Order
(
10
)
void
testCreateSubWorkflow
()
{
final
String
workflow
=
"test-sub-workflow-1"
;
WorkflowDefinitionTab
workflowDefinitionPage
=
new
ProjectPage
(
browser
)
.
goToNav
(
ProjectPage
.
class
)
.
goTo
(
project
)
.
goToTab
(
WorkflowDefinitionTab
.
class
);
workflowDefinitionPage
.
createWorkflow
()
.<
SubWorkflowTaskForm
>
addTask
(
TaskType
.
SUB_PROCESS
)
.
childNode
(
"test-workflow-1"
)
.
name
(
"test-sub-1"
)
.
submit
()
.
submit
()
.
name
(
workflow
)
.
tenant
(
tenant
)
.
addGlobalParam
(
"global_param"
,
"hello world"
)
.
submit
()
;
await
().
untilAsserted
(()
->
assertThat
(
workflowDefinitionPage
.
workflowList
()
).
anyMatch
(
it
->
it
.
getText
().
contains
(
workflow
)));
workflowDefinitionPage
.
publish
(
workflow
);
}
@Test
@Order
(
30
)
...
...
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
浏览文件 @
82394ba8
...
...
@@ -38,10 +38,17 @@ public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDe
@FindBy
(
className
=
"btn-create-process"
)
private
WebElement
buttonCreateProcess
;
@FindBy
(
className
=
"select-all"
)
@FindBys
({
@FindBy
(
className
=
"btn-selected"
),
@FindBy
(
className
=
"n-checkbox"
),
})
private
WebElement
checkBoxSelectAll
;
@FindBy
(
className
=
"btn-delete-all"
)
@FindBys
({
@FindBy
(
className
=
"btn-delete-all"
),
@FindBy
(
className
=
"n-button__content"
),
@FindBy
(
tagName
=
"span"
)
})
private
WebElement
buttonDeleteAll
;
@FindBys
({
...
...
@@ -98,7 +105,6 @@ public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDe
for
(
WebElement
cancelButton
:
cancelButtons
)
{
cancelButton
.
click
();
driver
().
navigate
().
refresh
();
}
return
this
;
...
...
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/SubWorkflowTaskForm.java
浏览文件 @
82394ba8
...
...
@@ -55,7 +55,7 @@ public final class SubWorkflowTaskForm extends TaskNodeForm {
public
SubWorkflowTaskForm
childNode
(
String
node
)
{
btnSelectChildNodeDropdown
().
click
();
new
WebDriverWait
(
driver
,
5
).
until
(
ExpectedConditions
.
visibilityOfElementLocated
(
new
By
.
ByC
lassName
(
new
WebDriverWait
(
driver
,
5
).
until
(
ExpectedConditions
.
visibilityOfElementLocated
(
By
.
c
lassName
(
"n-base-select-option__content"
)));
selectChildNode
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录