diff --git a/kafka-ui-e2e-checks/.env.example b/kafka-ui-e2e-checks/.env.example index 3ecc5ae9bf..d796cd58cb 100644 --- a/kafka-ui-e2e-checks/.env.example +++ b/kafka-ui-e2e-checks/.env.example @@ -1 +1,3 @@ -USE_LOCAL_BROWSER=false \ No newline at end of file +USE_LOCAL_BROWSER=true +SHOULD_START_SELENOID=false +TURN_OFF_SCREENSHOTS=true \ No newline at end of file diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/BaseTest.java index c770041a0b..14f3e0cf82 100644 --- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/BaseTest.java +++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/BaseTest.java @@ -48,16 +48,10 @@ public class BaseTest { static { Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue())); - if (TestConfiguration.CLEAR_REPORTS_DIR) clearReports(); - String remote = TestConfiguration.SELENOID_URL; - if (TestConfiguration.SHOULD_START_SELENOID) { - selenoid.start(); - remote = - "http://%s:%s/wd/hub" - .formatted(selenoid.getContainerIpAddress(), selenoid.getMappedPort(4444)); + if (TestConfiguration.CLEAR_REPORTS_DIR) { + clearReports(); } - setupSelenoid(remote); - SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false)); + setupSelenoid(); } @AfterAll @@ -67,10 +61,19 @@ public class BaseTest { } @SneakyThrows - private static void setupSelenoid(String remote) { + private static void setupSelenoid() { + String remote = TestConfiguration.SELENOID_URL; + if (TestConfiguration.SHOULD_START_SELENOID) { + selenoid.start(); + remote = + "http://%s:%s/wd/hub" + .formatted(selenoid.getContainerIpAddress(), selenoid.getMappedPort(4444)); + } + Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER; if (!TestConfiguration.USE_LOCAL_BROWSER) { Configuration.remote = remote; + TestConfiguration.BASE_URL = TestConfiguration.BASE_URL.replace("localhost", "host.docker.internal"); } Configuration.screenshots = TestConfiguration.SCREENSHOTS; Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE; @@ -81,6 +84,8 @@ public class BaseTest { var capabilities = new DesiredCapabilities(); capabilities.setCapability("enableVNC", TestConfiguration.ENABLE_VNC); Configuration.browserCapabilities = capabilities; + + SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false)); } public static void clearReports() { diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/TestConfiguration.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/TestConfiguration.java index e1a23c8fcd..09c85db1c0 100644 --- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/TestConfiguration.java +++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/TestConfiguration.java @@ -7,7 +7,7 @@ public class TestConfiguration { public static boolean SHOULD_START_SELENOID = Boolean.parseBoolean(System.getProperty("SHOULD_START_SELENOID", "false")); - public static String BASE_URL = System.getProperty("BASE_URL", "http://192.168.1.2:8080/"); + public static String BASE_URL = System.getProperty("BASE_URL", "http://localhost:8080/"); public static boolean USE_LOCAL_BROWSER = Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));