This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch user_e2e in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 12208e119075e8fd988a57ee9ea7b619203ddfad Author: janeHe13 <[email protected]> AuthorDate: Sun Dec 26 14:31:12 2021 +0800 add user manage e2e case --- .../java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java | 2 +- .../org/apache/dolphinscheduler/e2e/pages/security/UserPage.java | 6 ++---- .../src/js/conf/home/pages/security/pages/users/_source/list.vue | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java index ccb363e..5395179 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java @@ -72,7 +72,7 @@ class UserE2ETest { } @Test - @Order(10) + @Order(1) void testCreateUser() { final UserPage page = new UserPage(browser); diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java index 49c5444..90e7b2d 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/UserPage.java @@ -40,9 +40,6 @@ public final class UserPage extends NavBarPage implements SecurityPage.Tab { @FindBy(id = "btnCreateUser") private WebElement buttonCreateUser; - @FindBy(id = "btnEditUser") - private WebElement buttonEditUser; - @FindBy(className = "rows-user") private List<WebElement> userList; @@ -83,6 +80,7 @@ public final class UserPage extends NavBarPage implements SecurityPage.Tab { .filter(it -> it.getText().contains(user)) .findFirst() .ifPresent(it -> it.findElement(By.className("editUser")).click()); + editUserForm().inputUserName().sendKeys(editUser); editUserForm().inputUserPassword().sendKeys(editPassword); editUserForm().inputEmail().sendKeys(editEmail); @@ -102,7 +100,7 @@ public final class UserPage extends NavBarPage implements SecurityPage.Tab { .stream() .filter(it -> it.getText().contains(user)) .findFirst() - .ifPresent(it -> it.findElement(By.className("deleteUser")).click()); + .ifPresent(it -> it.findElement(By.className("delete")).click()); buttonConfirm().click(); diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue index 8ce5149..d640faa 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue @@ -62,7 +62,7 @@ </el-dropdown> </el-tooltip> <el-tooltip :content="$t('Edit')" placement="top"> - <el-button classname="btnEditUser" type="primary" size="mini" icon="el-icon-edit-outline" @click="_edit(scope.row)" circle></el-button> + <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="_edit(scope.row)" circle class="editUser"></el-button> </el-tooltip> <el-tooltip :content="$t('Delete')" placement="top"> <el-popconfirm @@ -73,7 +73,7 @@ :title="$t('Delete?')" @onConfirm="_delete(scope.row,scope.row.id)" > - <el-button className="btnDeleteUser" type="danger" size="mini" icon="el-icon-delete" circle slot="reference" class="delete"></el-button> + <el-button type="danger" size="mini" icon="el-icon-delete" circle slot="reference" class="delete"></el-button> </el-popconfirm> </el-tooltip> </template>
