Skip to content

Execute tests on Safari 7 (SauceLabs) #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
negruta wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Execute tests on Safari 7 (SauceLabs) #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e7939
Fix a bug that did not allow you to execute tests on Safari 7 on Sauc…
Nov 20, 2014
e8018a6
[SauceLabs] add support for Yosemite and more granular Mac version se…
Nov 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions ...c/main/java/net/thucydides/core/webdriver/capabilities/SauceRemoteDriverCapabilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.lang.reflect.Method;

import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import static org.apache.commons.lang3.StringUtils.isEmpty;

/**
* Provide Sauce Labs specific capabilities
Expand All @@ -22,7 +23,7 @@ public class SauceRemoteDriverCapabilities implements RemoteDriverCapabilities {

private final EnvironmentVariables environmentVariables;

public SauceRemoteDriverCapabilities(EnvironmentVariables environmentVariables){
public SauceRemoteDriverCapabilities(EnvironmentVariables environmentVariables) {
this.environmentVariables = environmentVariables;
}

Expand All @@ -46,39 +47,53 @@ public DesiredCapabilities getCapabilities(DesiredCapabilities capabilities) {
}

private void configureBrowserVersion(DesiredCapabilities capabilities) {
String driverVersion = ThucydidesSystemProperty.SAUCELABS_DRIVER_VERSION.from(environmentVariables);
String driverVersion = ThucydidesSystemProperty.SAUCELABS_DRIVER_VERSION
.from(environmentVariables);
if (isNotEmpty(driverVersion)) {
capabilities.setCapability("version", driverVersion);
}
}

private void configureTargetPlatform(DesiredCapabilities capabilities) {
String platformValue = ThucydidesSystemProperty.SAUCELABS_TARGET_PLATFORM.from(environmentVariables);
if (isNotEmpty(platformValue)) {
capabilities.setCapability("platform", platformFrom(platformValue));
}
if (capabilities.getBrowserName().equals("safari"))
{
setAppropriateSaucelabsPlatformVersion(capabilities);
if (capabilities.getBrowserName().equals("safari")) {
setAppropriateSaucelabsPlatformVersionForSafari(capabilities);
}
}

private void setAppropriateSaucelabsPlatformVersionForSafari(DesiredCapabilities capabilities)
{
if (ThucydidesSystemProperty.SAUCELABS_DRIVER_VERSION.from(environmentVariables).equalsIgnoreCase("mac"))
{
String browserVersion = ThucydidesSystemProperty.SAUCELABS_DRIVER_VERSION.from(environmentVariables);
if (browserVersion.equals("5"))
{
private void setAppropriateSaucelabsPlatformVersion(DesiredCapabilities capabilities) {
String platformValue = ThucydidesSystemProperty.SAUCELABS_TARGET_PLATFORM
.from(environmentVariables);
if (isEmpty(platformValue)) {
return;
}
if (platformValue.equalsIgnoreCase("snowleopard")) {
capabilities.setCapability("platform", "OS X 10.6");
} else if (platformValue.equalsIgnoreCase("mountainlion")) {
capabilities.setCapability("platform", "OS X 10.8");
} else if (platformValue.equalsIgnoreCase("mavericks")) {
capabilities.setCapability("platform", "OS X 10.9");
} else if (platformValue.equalsIgnoreCase("yosemite")) {
capabilities.setCapability("platform", "OS X 10.10");
} else {
capabilities.setCapability("platform", platformFrom(platformValue));

}
}

private void setAppropriateSaucelabsPlatformVersionForSafari(DesiredCapabilities capabilities) {
if (ThucydidesSystemProperty.SAUCELABS_TARGET_PLATFORM.from(environmentVariables)
.equalsIgnoreCase("mac")) {
String browserVersion = ThucydidesSystemProperty.SAUCELABS_DRIVER_VERSION
.from(environmentVariables);
if (browserVersion.equals("5")) {
capabilities.setCapability("platform", "OS X 10.6");
}
else if (browserVersion.equals("6"))
{
} else if (browserVersion.equals("6")) {
capabilities.setCapability("platform", "OS X 10.8");
}
else if (browserVersion.equals("7"))
{
} else if (browserVersion.equals("7")) {
capabilities.setCapability("platform", "OS X 10.9");
} else if (browserVersion.equals("8")) {
capabilities.setCapability("platform", "OS X 10.10");
}
}
}
Expand Down