This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 613ae078c [Improve] e2e minor improvement (#4048)
613ae078c is described below
commit 613ae078cf9086479be82b9cdb7d21f23399dc28
Author: benjobs <[email protected]>
AuthorDate: Mon Sep 9 14:29:46 2024 +0800
[Improve] e2e minor improvement (#4048)
* [Improve] e2e minor improvement
* [Improve] role page minor improvement
---
.github/workflows/e2e.yml | 4 ++--
.../src/views/system/role/components/RoleDrawer.vue | 2 ++
.../streampark/e2e/pages/flink/applications/ApplicationsPage.java | 3 +++
.../java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java | 4 ++++
.../org/apache/streampark/e2e/pages/system/RoleManagementPage.java | 4 ++--
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index dd83da726..098939bdf 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -116,8 +116,8 @@ jobs:
class: org.apache.streampark.e2e.cases.AlarmTest
- name: UserManagementTest
class: org.apache.streampark.e2e.cases.UserManagementTest
- #- name: RoleManagementTest
- # class: org.apache.streampark.e2e.cases.RoleManagementTest
+ - name: RoleManagementTest
+ class: org.apache.streampark.e2e.cases.RoleManagementTest
- name: TeamManagementTest
class: org.apache.streampark.e2e.cases.TeamManagementTest
- name: MemberManagementTest
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
b/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
index 264b648da..5ec33b101 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
@@ -105,7 +105,9 @@
},
];
});
+
const [registerForm, { resetFields, setFieldsValue, validate }] =
useForm({
+ name: 'role_form',
labelWidth: 120,
colon: true,
baseColProps: { span: 22 },
diff --git
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
index 4e6f2d926..1577f1b40 100644
---
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
+++
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
@@ -60,6 +60,9 @@ public class ApplicationsPage extends NavBarPage implements
ApacheFlinkPage.Tab
public ApplicationForm createApplication() {
waitForPageLoading();
+ new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION)
+
.until(ExpectedConditions.elementToBeClickable(buttonCreateApplication));
+
buttonCreateApplication.click();
new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION)
.until(ExpectedConditions.urlContains("/flink/app/add"));
diff --git
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java
index a4b4b23c1..fa7c2168d 100644
---
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java
+++
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java
@@ -61,6 +61,10 @@ public class ProjectsPage extends NavBarPage implements
ResourcePage.Tab {
String projectBuildArgument,
String projectDescription) {
waitForPageLoading();
+
+ new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION)
+
.until(ExpectedConditions.elementToBeClickable(buttonCreateProject));
+
buttonCreateProject.click();
new WebDriverWait(driver, Constants.DEFAULT_WEBDRIVER_WAIT_DURATION)
.until(ExpectedConditions.urlContains("/project/add"));
diff --git
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
index c8d3968a3..7f10f6d3b 100644
---
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
+++
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
@@ -139,10 +139,10 @@ public class RoleManagementPage extends NavBarPage
implements SystemPage.Tab {
PageFactory.initElements(driver, this);
}
- @FindBy(id = "form_item_roleName")
+ @FindBy(id = "role_form_roleName")
private WebElement inputRoleName;
- @FindBy(id = "form_item_description")
+ @FindBy(id = "role_form_description")
private WebElement inputDescription;
@FindBys({
