From 7b22c16a8501e767c65b2a2e502c22749f7934e9 Mon Sep 17 00:00:00 2001 From: xiangzihao <460888207@qq.com> Date: Thu, 27 Jan 2022 14:59:22 +0800 Subject: [PATCH] [E2E]Fix file manage e2e error (#8214) --- .../apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | 5 +++++ dolphinscheduler-ui/src/js/module/components/nav/nav.vue | 1 + 2 files changed, 6 insertions(+) diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java index 8531099ccc..e9e708cf3a 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java @@ -37,6 +37,7 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Duration; import java.util.Comparator; import org.junit.jupiter.api.AfterAll; @@ -46,6 +47,8 @@ import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.RemoteWebDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; import lombok.SneakyThrows; @@ -289,6 +292,8 @@ public class FileManageE2ETest { page.uploadFile(testUnder1GBFilePath.toFile().getAbsolutePath()); + new WebDriverWait(browser, 10).until(ExpectedConditions.invisibilityOfElementLocated(By.id("fileUpdateDialog"))); + await().untilAsserted(() -> { assertThat(page.fileList()) .as("File list should contain newly-created file") diff --git a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue index ed8451fb8f..a02b39abfb 100644 --- a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue +++ b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue @@ -144,6 +144,7 @@