0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

local run fixes

Browse source
This commit is contained in:
marat 2021-05-06 12:11:10 +03:00
parent deaa4555fa
commit 24fbd1631c
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kafka-ui-e2e-checks/.env.example
View file

@ -1 +1,3 @@
USE_LOCAL_BROWSER=false USE_LOCAL_BROWSER=true
SHOULD_START_SELENOID=false
TURN_OFF_SCREENSHOTS=true

25
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/BaseTest.java
View file

@ -48,16 +48,10 @@ public class BaseTest {
static { static {
Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue())); Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
if (TestConfiguration.CLEAR_REPORTS_DIR) clearReports(); if (TestConfiguration.CLEAR_REPORTS_DIR) {
String remote = TestConfiguration.SELENOID_URL; clearReports();
if (TestConfiguration.SHOULD_START_SELENOID) {
selenoid.start();
remote =
"http://%s:%s/wd/hub"
.formatted(selenoid.getContainerIpAddress(), selenoid.getMappedPort(4444));
} }
setupSelenoid(remote); setupSelenoid();
SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
} }
@AfterAll @AfterAll
@ -67,10 +61,19 @@ public class BaseTest {
} }
@SneakyThrows @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; Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
if (!TestConfiguration.USE_LOCAL_BROWSER) { if (!TestConfiguration.USE_LOCAL_BROWSER) {
Configuration.remote = remote; Configuration.remote = remote;
TestConfiguration.BASE_URL = TestConfiguration.BASE_URL.replace("localhost", "host.docker.internal");
} }
Configuration.screenshots = TestConfiguration.SCREENSHOTS; Configuration.screenshots = TestConfiguration.SCREENSHOTS;
Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE; Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
@ -81,6 +84,8 @@ public class BaseTest {
var capabilities = new DesiredCapabilities(); var capabilities = new DesiredCapabilities();
capabilities.setCapability("enableVNC", TestConfiguration.ENABLE_VNC); capabilities.setCapability("enableVNC", TestConfiguration.ENABLE_VNC);
Configuration.browserCapabilities = capabilities; Configuration.browserCapabilities = capabilities;
SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
} }
public static void clearReports() { public static void clearReports() {

2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/base/TestConfiguration.java
View file

@ -7,7 +7,7 @@ public class TestConfiguration {
public static boolean SHOULD_START_SELENOID = public static boolean SHOULD_START_SELENOID =
Boolean.parseBoolean(System.getProperty("SHOULD_START_SELENOID", "false")); 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 = public static boolean USE_LOCAL_BROWSER =
Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true")); Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));