diff --git a/README.md b/README.md index 3a10206a70..9663e02bf0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/c719a14f5537488b8fb95d70e27acd5f)](https://www.codacy.com/app/diemol_zalenium/zalenium?utm_source=github.com&utm_medium=referral&utm_content=zalando/zalenium&utm_campaign=Badge_Grade) [![codecov](https://codecov.io/gh/zalando/zalenium/branch/master/graph/badge.svg)](https://codecov.io/gh/zalando/zalenium) [![](https://images.microbadger.com/badges/version/dosel/zalenium.svg)](https://microbadger.com/images/dosel/zalenium) -[![](https://images.microbadger.com/badges/version/dosel/zalenium:3.0.1h.svg)](https://microbadger.com/images/dosel/zalenium:3.0.1h) +[![](https://images.microbadger.com/badges/version/dosel/zalenium:3.1.0a.svg)](https://microbadger.com/images/dosel/zalenium:3.1.0a) # What is Zalenium? A Selenium Grid extension to scale up and down your local grid dynamically with docker containers. It uses diff --git a/pom.xml b/pom.xml index 2d8ac262dc..1465d9a24f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.zalando.tip zalenium - 3.0.1i-SNAPSHOT + 3.1.0a-SNAPSHOT Zalenium An on-demand, dynamic local Selenium Grid with an extension to a cloud testing platform. @@ -48,8 +48,8 @@ - 3.0 - 1 + 3.1 + 0 7.0.2 4.12 2.6.2 @@ -86,6 +86,10 @@ org.slf4j slf4j-api + + com.google.guava + guava + diff --git a/src/main/java/de/zalando/tip/zalenium/proxy/DockerSeleniumStarterRemoteProxy.java b/src/main/java/de/zalando/tip/zalenium/proxy/DockerSeleniumStarterRemoteProxy.java index 398595889a..5ac8a32d81 100644 --- a/src/main/java/de/zalando/tip/zalenium/proxy/DockerSeleniumStarterRemoteProxy.java +++ b/src/main/java/de/zalando/tip/zalenium/proxy/DockerSeleniumStarterRemoteProxy.java @@ -346,7 +346,7 @@ boolean startDockerSeleniumContainer(String browser) { envVariables.add("WAIT_TIMEOUT=120s"); envVariables.add("PICK_ALL_RANDMON_PORTS=true"); envVariables.add("PICK_ALL_RANDOM_PORTS=true"); - envVariables.add("VIDEO_STOP_SLEEP_SECS=6"); + envVariables.add("VIDEO_STOP_SLEEP_SECS=1"); envVariables.add("WAIT_TIME_OUT_VIDEO_STOP=20s"); boolean sendAnonymousUsageInfo = env.getBooleanEnvVariable("ZALENIUM_SEND_ANONYMOUS_USAGE_INFO", false); envVariables.add("SEND_ANONYMOUS_USAGE_INFO=" + sendAnonymousUsageInfo); diff --git a/src/main/java/de/zalando/tip/zalenium/servlet/live.java b/src/main/java/de/zalando/tip/zalenium/servlet/live.java index f68f26f477..2814dca52b 100644 --- a/src/main/java/de/zalando/tip/zalenium/servlet/live.java +++ b/src/main/java/de/zalando/tip/zalenium/servlet/live.java @@ -80,9 +80,9 @@ protected void process(HttpServletRequest request, HttpServletResponse response) builder.append(""); builder.append(""); - builder.append(""); - builder.append(""); - builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); builder.append(""); if (refresh != -1) { @@ -118,13 +118,13 @@ protected void process(HttpServletRequest request, HttpServletResponse response) int rightColumnSize = size / 2; int leftColumnSize = size - rightColumnSize; - builder.append("
"); + builder.append("
"); for (int i = 0; i < leftColumnSize; i++) { builder.append(nodes.get(i)); } builder.append("
"); - builder.append("
"); + builder.append("
"); for (int i = leftColumnSize; i < nodes.size(); i++) { builder.append(nodes.get(i)); } diff --git a/src/test/java/de/zalando/tip/zalenium/it/ParallelIT.java b/src/test/java/de/zalando/tip/zalenium/it/ParallelIT.java index 99c20d09a6..31e2739a84 100644 --- a/src/test/java/de/zalando/tip/zalenium/it/ParallelIT.java +++ b/src/test/java/de/zalando/tip/zalenium/it/ParallelIT.java @@ -86,12 +86,12 @@ public void startWebDriverAndGetBaseUrl(Method method, Object[] testArgs) throws try { webDriver.set(new RemoteWebDriver(new URL(DOCKER_SELENIUM_URL), desiredCapabilities)); + webDriver.get().manage().window().maximize(); } catch (Exception e) { LOGGER.warn("FAILED {} on {} - {}", method.getName(), browserType, platform.name()); throw e; } - webDriver.get().manage().window().maximize(); } @AfterMethod