From: Leif Åstrand <leif@vaadin.com>
Date: Sat, 14 Mar 2015 13:48:52 +0000 (+0200)
Subject: Re-enable support for the firefox.path property
X-Git-Tag: 7.5.0.alpha1~8^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=989203a680dce14b5dde4abf0291a480cace56cd;p=vaadin-framework.git

Re-enable support for the firefox.path property

Change-Id: I14d4ca1a2ef51ff77404cd6577cbe7cb35a2f75d
---

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);
             }