diff options
| author | Artur Signell <artur@vaadin.com> | 2015-05-28 23:14:05 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-06-04 07:59:45 +0000 |
| commit | 3954d200f0d1236738cdcd147d5b07540d812bba (patch) | |
| tree | f4365288c780765a9e1e2186905e18d6bc17ca35 /uitest/src/com/vaadin/tests/tb3 | |
| parent | 8da6cbdd0268214dbcf9cf05eb052e6d02c13c94 (diff) | |
| download | vaadin-framework-3954d200f0d1236738cdcd147d5b07540d812bba.tar.gz vaadin-framework-3954d200f0d1236738cdcd147d5b07540d812bba.zip | |
Allow specifying location of PhantomJS binary
Change-Id: Idf04ba5c3712a387010bc2a28a119e81499f1f75
Diffstat (limited to 'uitest/src/com/vaadin/tests/tb3')
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java | 5 |
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 61b7ef4dde..77b9b9ef7d 100644 --- 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); } |