diff options
| author | Artur Signell <artur@vaadin.com> | 2015-07-14 19:20:38 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-09-02 16:54:53 +0300 |
| commit | 7e3fb8e6f888e3570c03d4acf1d9585894020b29 (patch) | |
| tree | 8bce41bedbff610939e1dbc783b64ab981ede91e /uitest | |
| parent | 1c45292021467d41ac8afecd0ece1f2d98a3962a (diff) | |
| download | vaadin-framework-7e3fb8e6f888e3570c03d4acf1d9585894020b29.tar.gz vaadin-framework-7e3fb8e6f888e3570c03d4acf1d9585894020b29.zip | |
Update to TestBench 4.0.3
Change-Id: I0aaf02f57681804c380102d0078a3896f670d859
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/ivy.xml | 11 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/TB3Runner.java | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 8f2765c7a4..cb2d5cff45 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -78,15 +78,19 @@ <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="org.eclipse.jetty" name="jetty-websocket" - rev="&jetty.version;" conf="ide, jetty-run->default"> + rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> + <dependency org="org.eclipse.jetty" name="jetty-util" + rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> <dependency org="org.mortbay.jetty" name="jetty-runner" - rev="&jetty.version;" conf="ide, jetty-run->default"> + rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> @@ -104,7 +108,7 @@ <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="build,ide -> default" /> <dependency org="com.vaadin" name="vaadin-testbench" - rev="4.0.2" conf="build-provided,ide -> default" /> + rev="4.0.3" conf="build-provided,ide -> default" /> <!-- This should be removed once tests have been updated to use lang3 --> <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="build,ide -> default" /> @@ -114,7 +118,6 @@ <dependency org="com.vaadin" name="vaadin-buildhelpers" rev="${vaadin.version}" conf="compile-theme->build" /> - <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="3.5.1.201410131835-r" conf="ide,build->default"> <exclude org="org.apache.httpcomponents"></exclude> diff --git a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java index acdef54492..4917e398cf 100644 --- a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java +++ b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java @@ -22,7 +22,7 @@ import java.lang.reflect.Modifier; import org.apache.http.client.HttpClient; import org.junit.runners.Parameterized; import org.junit.runners.model.InitializationError; -import org.openqa.selenium.remote.HttpCommandExecutor; +import org.openqa.selenium.remote.internal.ApacheHttpClient; import org.openqa.selenium.remote.internal.HttpClientFactory; import com.vaadin.testbench.parallel.ParallelRunner; @@ -48,8 +48,8 @@ public class TB3Runner extends ParallelRunner { // reduce socket timeout to avoid tests hanging for three hours try { - Field field = HttpCommandExecutor.class - .getDeclaredField("httpClientFactory"); + Field field = ApacheHttpClient.Factory.class + .getDeclaredField("defaultClientFactory"); assert (Modifier.isStatic(field.getModifiers())); field.setAccessible(true); field.set(null, new HttpClientFactory() { |