Skip to content

Commit 1208a71

Browse files
committed
e2e: move back seleniod option
1 parent 93e0085 commit 1208a71

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

e2e-tests/src/main/java/io/kafbat/ui/settings/BaseSource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
public abstract class BaseSource {
88

99
public static final boolean HEADLESS = parseBoolean(getOptionalString(TRUE, System.getProperty("headless")));
10+
public static final boolean SELENOID = parseBoolean(getOptionalString(TRUE, System.getProperty("selenoid")));
1011
public static final String CLUSTER_NAME = "local";
1112
public static final String CONNECT_NAME = "first";
1213
private static final String LOCAL_HOST = "localhost";
1314
public static final String REMOTE_URL = String.format("http://%s:4444/wd/hub", LOCAL_HOST);
1415
public static final String BASE_API_URL = String.format("http://%s:8080", LOCAL_HOST);
15-
public static final String BASE_HOST = "host.docker.internal";
16+
public static final String BASE_HOST = SELENOID ? "host.docker.internal" : LOCAL_HOST;
1617
public static final String BASE_UI_URL = String.format("http://%s:8080", BASE_HOST);
1718
}

e2e-tests/src/main/java/io/kafbat/ui/settings/drivers/WebDriver.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ public static void browserSetup() {
3838
.addArguments("--disable-gpu")
3939
.addArguments("--no-sandbox")
4040
.addArguments("--lang=en_US");
41-
42-
Configuration.remote = BaseSource.REMOTE_URL;
43-
Configuration.remoteConnectionTimeout = 180000;
44-
Configuration.remoteReadTimeout = 180000;
45-
Map<String, Object> selenoidOptions = new HashMap<>();
46-
selenoidOptions.put("enableVNC", true);
47-
selenoidOptions.put("enableLog", true);
48-
selenoidOptions.put("enableVideo", false);
49-
selenoidOptions.put("sessionTimeout", "30m");
50-
chromeOptions.setCapability("selenoid:options", selenoidOptions);
51-
41+
if (BaseSource.SELENOID) {
42+
Configuration.remote = BaseSource.REMOTE_URL;
43+
Configuration.remoteConnectionTimeout = 180000;
44+
Configuration.remoteReadTimeout = 180000;
45+
Map<String, Object> selenoidOptions = new HashMap<>();
46+
selenoidOptions.put("enableVNC", true);
47+
selenoidOptions.put("enableLog", true);
48+
selenoidOptions.put("enableVideo", false);
49+
selenoidOptions.put("sessionTimeout", "30m");
50+
chromeOptions.setCapability("selenoid:options", selenoidOptions);
51+
}
5252
Configuration.browserCapabilities = chromeOptions;
5353
}
5454

0 commit comments

Comments
 (0)