From cca6cd03b475dbdc256c6e43eb2034d024e2d59a Mon Sep 17 00:00:00 2001 From: Kishen Simbhoedatpanday Date: Wed, 24 Jun 2015 16:35:50 +0200 Subject: [PATCH 1/2] Fix for setting up the remote webdriver capability: webdriver.remote.browser.version --- .../java/net/thucydides/core/webdriver/WebDriverFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java index 1435c95594..bc340fd74a 100644 --- a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java +++ b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java @@ -359,7 +359,7 @@ private DesiredCapabilities capabilitiesForDriver(String driver) { Preconditions.checkNotNull(driverType, "Unsupported remote driver type: "); - if (driverType == SupportedWebDriver.REMOTE) { + if (shouldUseARemoteDriver()) { return (DesiredCapabilities) enhancedCapabilities(remoteCapabilities()); } else { return (DesiredCapabilities) enhancedCapabilities(realBrowserCapabilities(driverType)); @@ -431,9 +431,10 @@ private DesiredCapabilities remoteCapabilities() { } if (environmentVariables.getProperty(ThucydidesSystemProperty.WEBDRIVER_REMOTE_BROWSER_VERSION) != null) { - capabilities.setCapability("version", Platform.valueOf(environmentVariables.getProperty(ThucydidesSystemProperty.WEBDRIVER_REMOTE_BROWSER_VERSION))); + capabilities.setCapability("version", environmentVariables.getProperty(ThucydidesSystemProperty.WEBDRIVER_REMOTE_BROWSER_VERSION)); } + return capabilities; } From 395a9a64e193991b4387c90db6f81b6150b48d4f Mon Sep 17 00:00:00 2001 From: Kishen Simbhoedatpanday Date: Wed, 24 Jun 2015 17:57:21 +0200 Subject: [PATCH 2/2] Fixes unit tests - nullpointer exception fix when system property webdriver.remote.driver is not set --- .../net/thucydides/core/webdriver/WebDriverFactory.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java index bc340fd74a..1e55aeab54 100644 --- a/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java +++ b/serenity-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java @@ -418,7 +418,11 @@ private DesiredCapabilities realBrowserCapabilities(SupportedWebDriver driverTyp } private DesiredCapabilities remoteCapabilities() { - String remoteBrowser = ThucydidesSystemProperty.WEBDRIVER_REMOTE_DRIVER.from(environmentVariables, "firefox"); + String remoteBrowser = ThucydidesSystemProperty.WEBDRIVER_REMOTE_DRIVER.from(environmentVariables, getDriverFrom(environmentVariables)); + if (remoteBrowser == null) { + remoteBrowser = "firefox"; + } + DesiredCapabilities capabilities = realBrowserCapabilities(driverTypeFor(remoteBrowser)); capabilities.setCapability("idle-timeout",EXTRA_TIME_TO_TAKE_SCREENSHOTS);