diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 735fd6325b..ae5757ce6f 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -20,7 +20,7 @@ jobs: - name: Set the values id: step_one run: | - cat "./kafka-ui-e2e-checks/.env.example" >> "./kafka-ui-e2e-checks/.env" + cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env" - name: pull docker id: step_four run: | diff --git a/kafka-ui-e2e-checks/.env.ci b/kafka-ui-e2e-checks/.env.ci new file mode 100644 index 0000000000..cf6cd6d433 --- /dev/null +++ b/kafka-ui-e2e-checks/.env.ci @@ -0,0 +1,3 @@ +USE_LOCAL_BROWSER=false +SHOULD_START_SELENOID=true +TURN_OFF_SCREENSHOTS=true diff --git a/kafka-ui-e2e-checks/.env.example b/kafka-ui-e2e-checks/.env.example index cf6cd6d433..de43f7b2dc 100644 --- a/kafka-ui-e2e-checks/.env.example +++ b/kafka-ui-e2e-checks/.env.example @@ -1,3 +1,3 @@ -USE_LOCAL_BROWSER=false -SHOULD_START_SELENOID=true +USE_LOCAL_BROWSER=true +SHOULD_START_SELENOID=false TURN_OFF_SCREENSHOTS=true diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java index f74455b45a..ebf9080788 100644 --- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java +++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java @@ -9,6 +9,7 @@ import io.github.cdimascio.dotenv.Dotenv; import io.qameta.allure.selenide.AllureSelenide; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.DisplayNameGeneration; import org.openqa.selenium.remote.DesiredCapabilities; @@ -17,6 +18,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; import java.io.File; +import java.io.IOException; import java.util.Arrays; @Slf4j @@ -48,9 +50,15 @@ public class BaseTest { "-conf", "/etc/selenoid/browsers.json", "-log-output-dir", "/opt/selenoid/logs"); static { - if (new File("./.env").exists()) { - Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue())); + if (!new File("./.env").exists()) { + try { + FileUtils.copyFile(new File(".env.example"), new File(".env")); + } catch (IOException e) { + log.error("couldn't copy .env.example to .env. Please add .env"); + e.printStackTrace(); + } } + Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue())); if (TestConfiguration.CLEAR_REPORTS_DIR) { clearReports(); } diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java index 4b328e0265..ff07c84bef 100644 --- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java +++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java @@ -38,6 +38,8 @@ public class Screenshooter { Boolean.parseBoolean(System.getProperty("SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST", "true")); private static boolean TURN_OFF_SCREENSHOTS = Boolean.parseBoolean(System.getProperty("TURN_OFF_SCREENSHOTS", "false")); + private static boolean USE_LOCAL_BROWSER = + Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "false")); private File newFile(String name) { var file = new File(name); @@ -58,7 +60,9 @@ public class Screenshooter { @SneakyThrows public void compareScreenshots(String name, boolean shouldUpdateScreenshotIfDiffer) { - if (TURN_OFF_SCREENSHOTS) { + if (TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER) { + log.warn("compareScreenshots turned off due TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER: %b || %b" + .formatted(TURN_OFF_SCREENSHOTS,USE_LOCAL_BROWSER)); return; } if (!doesScreenshotExist(name)) { diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java index c36d58b440..a6a97299f0 100644 --- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java +++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java @@ -4,9 +4,7 @@ import com.provectus.kafka.ui.base.BaseTest; import com.provectus.kafka.ui.pages.MainPage; import com.provectus.kafka.ui.steps.kafka.KafkaSteps; import lombok.SneakyThrows; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.*; public class TopicTests extends BaseTest {