aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java4
-rw-r--r--uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java3
2 files changed, 5 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 1c0542b209..7df65829ae 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -97,7 +97,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
super.setup();
}
- private static DesiredCapabilities getRunLocallyCapabilities() {
+ protected static DesiredCapabilities getRunLocallyCapabilities() {
VaadinBrowserFactory factory = new VaadinBrowserFactory();
try {
return factory.create(Browser.valueOf(properties.getProperty(
@@ -159,7 +159,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
return getConfiguredDeploymentHostname();
}
- private boolean isRunLocally() {
+ protected boolean isRunLocally() {
if (properties.containsKey(RUN_LOCALLY_PROPERTY)) {
return true;
}
diff --git a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
index 960d6b8777..b5389d3eec 100644
--- a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
@@ -25,6 +25,9 @@ import com.vaadin.testbench.parallel.Browser;
public abstract class SingleBrowserTest extends PrivateTB3Configuration {
@Override
public List<DesiredCapabilities> getBrowsersToTest() {
+ if (isRunLocally()) {
+ return Collections.singletonList(getRunLocallyCapabilities());
+ }
return Collections.singletonList(Browser.PHANTOMJS
.getDesiredCapabilities());
}