aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/com
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-03-14 15:48:52 +0200
committerVaadin Code Review <review@vaadin.com>2015-03-18 14:06:44 +0000
commit989203a680dce14b5dde4abf0291a480cace56cd (patch)
tree317ea0b90924448cdaf2aa2bfa5a98c3b5652aaf /uitest/src/com
parent9fc6c2be597f09c568389dfb147efe1e09af2f07 (diff)
downloadvaadin-framework-989203a680dce14b5dde4abf0291a480cace56cd.tar.gz
vaadin-framework-989203a680dce14b5dde4abf0291a480cace56cd.zip
Re-enable support for the firefox.path property
Change-Id: I14d4ca1a2ef51ff77404cd6577cbe7cb35a2f75d
Diffstat (limited to 'uitest/src/com')
-rw-r--r--uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 05ffa99511..d0134a4feb 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -53,6 +53,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
private static final Properties properties = new Properties();
private static final File propertiesFile = new File("work",
"eclipse-run-selected-test.properties");
+ private static final String FIREFOX_PATH = "firefox.path";
static {
if (propertiesFile.exists()) {
@@ -66,6 +67,10 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
localBrowser.getBrowserName()
+ localBrowser.getVersion());
}
+ if (properties.containsKey(FIREFOX_PATH)) {
+ System.setProperty(FIREFOX_PATH,
+ properties.getProperty(FIREFOX_PATH));
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}