Skip to content
This repository has been archived by the owner on Sep 21, 2021. It is now read-only.

Commit

Permalink
Merge pull request #68 from zalando/selenium-3.1.0
Browse files Browse the repository at this point in the history
Selenium 3.1.0
  • Loading branch information
diemol authored Feb 27, 2017
2 parents af65f06 + 16e9106 commit 3428b8a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>de.zalando.tip</groupId>
<artifactId>zalenium</artifactId>
<version>3.0.1i-SNAPSHOT</version>
<version>3.1.0a-SNAPSHOT</version>
<name>Zalenium</name>
<description>An on-demand, dynamic local Selenium Grid with an extension to a cloud testing platform.</description>

Expand Down Expand Up @@ -48,8 +48,8 @@
</developers>

<properties>
<selenium-server.major-minor.version>3.0</selenium-server.major-minor.version>
<selenium-server.patch-level.version>1</selenium-server.patch-level.version>
<selenium-server.major-minor.version>3.1</selenium-server.major-minor.version>
<selenium-server.patch-level.version>0</selenium-server.patch-level.version>
<docker-client.version>7.0.2</docker-client.version>
<junit.version>4.12</junit.version>
<mockito.version>2.6.2</mockito.version>
Expand Down Expand Up @@ -86,6 +86,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/de/zalando/tip/zalenium/servlet/live.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ protected void process(HttpServletRequest request, HttpServletResponse response)

builder.append("<html>");
builder.append("<head>");
builder.append("<script src='//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js'></script>");
builder.append("<script src='/grid/resources/org/openqa/grid/images/console-beta.js'></script>");
builder.append("<link href='/grid/resources/org/openqa/grid/images/console-beta.css' rel='stylesheet' type='text/css' />");
builder.append("<script src='/grid/resources/org/openqa/grid/images/jquery-3.1.1.min.js'></script>");
builder.append("<script src='/grid/resources/org/openqa/grid/images/consoleservlet.js'></script>");
builder.append("<link href='/grid/resources/org/openqa/grid/images/consoleservlet.css' rel='stylesheet' type='text/css' />");
builder.append("<link href='/grid/resources/org/openqa/grid/images/favicon.ico' rel='icon' type='image/x-icon' />");

if (refresh != -1) {
Expand Down Expand Up @@ -118,13 +118,13 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
int rightColumnSize = size / 2;
int leftColumnSize = size - rightColumnSize;

builder.append("<div id='leftColumn'>");
builder.append("<div id='left-column'>");
for (int i = 0; i < leftColumnSize; i++) {
builder.append(nodes.get(i));
}
builder.append("</div>");

builder.append("<div id='rightColumn'>");
builder.append("<div id='right-column'>");
for (int i = leftColumnSize; i < nodes.size(); i++) {
builder.append(nodes.get(i));
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/de/zalando/tip/zalenium/it/ParallelIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3428b8a

Please sign in to comment.