Allow specifying location of PhantomJS binary

Change-Id: Idf04ba5c3712a387010bc2a28a119e81499f1f75

diff --git a/uitest/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties
index 535885f8779a6f4d6706071216c6674d7a996abe..e0f93bfc7caa02199636122bf4f6f204fad8f50a 100644 (file)
--- a/uitest/eclipse-run-selected-test.properties
+++ b/uitest/eclipse-run-selected-test.properties
@@ -6,7 +6,7 @@
 ;
 
 ;
-; For both TestBench 2 and 3
+; For both TestBench 2 and 4
 ;
 
 ; Location of the screenshot directory. 
@@ -18,13 +18,17 @@ com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshot
 ; com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/
 
 ;
-; For only TestBench 3
+; For only TestBench 4
 ;
 
 ; Simulates @RunLocally with the given value on all test classes without a @RunLocally annotation.
 ; Use simple browser name (phantomjs, chrome, firefox, ie8, ie9, ie10, ie11)
 ; com.vaadin.testbench.runLocally=firefox
 
+; Optional override to specify the location of the Firefox/PhantomJS binary
+; firefox.path=/usr/bin/firefox
+; phantomjs.binary.path=/usr/bin/phantomjs
+
 ; By default using @RunLocally annotation in Framework tests is not allowed. 
 ; Running tests locally can be done with com.vaadin.testbench.runLocally parameter above. 
 ; Uncomment the following line if you want to be able to use @RunLocally annotation

diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 61b7ef4ddea7ccccee805f6d78b5799b7e20384b..77b9b9ef7de4ac9e7d5e1eaa3ae1a68b9c47f75c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -57,6 +57,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     private static final File propertiesFile = new File("work",
             "eclipse-run-selected-test.properties");
     private static final String FIREFOX_PATH = "firefox.path";
+    private static final String PHANTOMJS_PATH = "phantomjs.binary.path";
 
     static {
         if (propertiesFile.exists()) {
@@ -74,6 +75,10 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
                     System.setProperty(FIREFOX_PATH,
                             properties.getProperty(FIREFOX_PATH));
                 }
+                if (properties.containsKey(PHANTOMJS_PATH)) {
+                    System.setProperty(PHANTOMJS_PATH,
+                            properties.getProperty(PHANTOMJS_PATH));
+                }
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }