Browse Source

[E2E] Modify the tenant delete of the e2e case (#7921)

* Update UserE2ETest.java
3.0.0/version-upgrade
janeHe13 3 years ago committed by GitHub
parent
commit
1ff339f37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java
  2. 11
      dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkerGroupE2ETest.java

7
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UserE2ETest.java

@ -25,6 +25,7 @@ import static org.awaitility.Awaitility.await;
import org.apache.dolphinscheduler.e2e.core.DolphinScheduler; import org.apache.dolphinscheduler.e2e.core.DolphinScheduler;
import org.apache.dolphinscheduler.e2e.pages.LoginPage; import org.apache.dolphinscheduler.e2e.pages.LoginPage;
import org.apache.dolphinscheduler.e2e.pages.common.NavBarPage;
import org.apache.dolphinscheduler.e2e.pages.security.SecurityPage; import org.apache.dolphinscheduler.e2e.pages.security.SecurityPage;
import org.apache.dolphinscheduler.e2e.pages.security.TenantPage; import org.apache.dolphinscheduler.e2e.pages.security.TenantPage;
import org.apache.dolphinscheduler.e2e.pages.security.UserPage; import org.apache.dolphinscheduler.e2e.pages.security.UserPage;
@ -65,10 +66,10 @@ class UserE2ETest {
@AfterAll @AfterAll
public static void cleanup() { public static void cleanup() {
new SecurityPage(browser) new NavBarPage(browser)
.goToNav(SecurityPage.class)
.goToTab(TenantPage.class) .goToTab(TenantPage.class)
.delete(tenant) .delete(tenant);
;
} }
@Test @Test

11
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkerGroupE2ETest.java

@ -49,20 +49,9 @@ class WorkerGroupE2ETest {
new LoginPage(browser) new LoginPage(browser)
.login("admin", "dolphinscheduler123") .login("admin", "dolphinscheduler123")
.goToNav(SecurityPage.class) .goToNav(SecurityPage.class)
.goToTab(TenantPage.class)
.create(tenant)
.goToNav(SecurityPage.class)
.goToTab(WorkerGroupPage.class); .goToTab(WorkerGroupPage.class);
} }
@AfterAll
public static void cleanup() {
new SecurityPage(browser)
.goToTab(TenantPage.class)
.delete(tenant)
;
}
@Test @Test
@Order(1) @Order(1)
void testCreateWorkerGroup() throws InterruptedException { void testCreateWorkerGroup() throws InterruptedException {

Loading…
Cancel
Save