[Improve] e2e minor improvement (#4048)

* [Improve] e2e minor improvement * [Improve] role page minor improvement
apache · Sep 9, 2024 · 613ae07 · 613ae07
1 parent 7c2334f
commit 613ae07
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -105,7 +105,9 @@
           },
         ];
       });
+
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+        name: 'role_form',
         labelWidth: 120,
         colon: true,
         baseColProps: { span: 22 },

diff --git a/...se/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java b/...se/src/test/java/org/apache/streampark/e2e/pages/flink/applications/ApplicationsPage.java
@@ -60,6 +60,9 @@ public ApplicationsPage(RemoteWebDriver driver) {
     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/...eampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java b/...eampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/resource/ProjectsPage.java
@@ -61,6 +61,10 @@ public ProjectsPage createProject(String projectName,
                                       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/...ark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java b/...ark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
@@ -139,10 +139,10 @@ public class CreateRoleForm {
             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({