From 1ff339f37bc7fbb56393c483f2828fc9ca8dcd27 Mon Sep 17 00:00:00 2001
From: janeHe13 <95271106+janeHe13@users.noreply.github.com>
Date: Mon, 10 Jan 2022 17:06:32 +0800
Subject: [PATCH] [E2E] Modify the tenant delete of the e2e case (#7921)

* Update UserE2ETest.java
---
 .../dolphinscheduler/e2e/cases/UserE2ETest.java       |  7 ++++---
 .../e2e/cases/WorkerGroupE2ETest.java                 | 11 -----------
 2 files changed, 4 insertions(+), 14 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 8b43e1bcb7..4597c6e231 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
@@ -25,6 +25,7 @@ import static org.awaitility.Awaitility.await;
 
 import org.apache.dolphinscheduler.e2e.core.DolphinScheduler;
 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.TenantPage;
 import org.apache.dolphinscheduler.e2e.pages.security.UserPage;
@@ -65,10 +66,10 @@ class UserE2ETest {
 
     @AfterAll
     public static void cleanup() {
-        new SecurityPage(browser)
+        new NavBarPage(browser)
+            .goToNav(SecurityPage.class)
             .goToTab(TenantPage.class)
-            .delete(tenant)
-        ;
+            .delete(tenant);
     }
 
     @Test
diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkerGroupE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkerGroupE2ETest.java
index fb75122afa..a0bc082cac 100644
--- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkerGroupE2ETest.java
+++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkerGroupE2ETest.java
@@ -49,20 +49,9 @@ class WorkerGroupE2ETest {
         new LoginPage(browser)
             .login("admin", "dolphinscheduler123")
             .goToNav(SecurityPage.class)
-            .goToTab(TenantPage.class)
-            .create(tenant)
-            .goToNav(SecurityPage.class)
             .goToTab(WorkerGroupPage.class);
     }
 
-    @AfterAll
-    public static void cleanup() {
-        new SecurityPage(browser)
-            .goToTab(TenantPage.class)
-            .delete(tenant)
-        ;
-    }
-
     @Test
     @Order(1)
     void testCreateWorkerGroup() throws InterruptedException {