add tests for working with safari

Author: nikolay-advolodkin

common/src/main/java/com/saucelabs/remotedriver/SafariVersion.java

@@ -0,0 +1,6 @@
+package com.saucelabs.remotedriver;
+
+public class SafariVersion {
+
+    public static String elevenDotOne = "11.1";
+}

common/src/main/java/com/saucelabs/remotedriver/SauceSession.java

@@ -5,6 +5,7 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.safari.SafariOptions;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -16,7 +17,7 @@ public class SauceSession {
 	static String SAUCE_ACCESS_KEY = System.getenv("SAUCE_ACCESS_KEY");
 
 	//todo there is some weird bug when this is set to Linux, the session can't be started
-	String platformName = "Windows 10";
+	String operatingSystem = "Windows 10";
 	String browserName = "Chrome";
 	String testName;
 	Boolean useSauce = true;
@@ -33,6 +34,7 @@ public class SauceSession {
     private RemoteDriverInterface remoteDriverManager;
     private MutableCapabilities browserOptions;
     private WebDriver webDriver;
+    private SafariOptions safariOptions;
 
     public SauceSession(){
         capabilities = new MutableCapabilities();
@@ -44,7 +46,7 @@ public SauceSession(RemoteDriverInterface remoteManager) {
         capabilities = new MutableCapabilities();
     }
 
-    public RemoteWebDriver getInstance() throws MalformedURLException
+    public RemoteWebDriver getWebDriver() throws MalformedURLException
     {
         seleniumServer = getSeleniumServer();
         capabilities = getCapabilities();
@@ -105,7 +107,7 @@ public SauceSession withFirefox()
 
 	public SauceSession withPlatform(String platformName)
 	{
-		this.platformName = platformName;
+		this.operatingSystem = platformName;
 
 		return this;
 	}
@@ -127,7 +129,7 @@ public MutableCapabilities getCapabilities() {
 
         capabilities.setCapability(sauceOptionsTag, sauceOptions);
         capabilities.setCapability("browserName", browserName);
-        capabilities.setCapability("platformName", platformName);
+        capabilities.setCapability("operatingSystem", operatingSystem);
         capabilities.setCapability("browserVersion", browserVersion);
 
         return capabilities;
@@ -179,11 +181,23 @@ public MutableCapabilities getSauceOptionsCapability(){
     }
 
     public SauceSession start() throws MalformedURLException {
-        webDriver = getInstance();
+        webDriver = getWebDriver();
         return this;
     }
 
     public WebDriver getDriver() {
         return webDriver;
     }
+
+    //TODO How do we want to handle this?
+    //1. withSafari(OperatingSystem.MacOs1014), aka, force the user to pass in a mac version
+    //2. throw an exception for withSafari() used without withMac();
+    //3. this is the method I chose below
+    public SauceSession withSafari(String browserVersion) {
+        operatingSystem = "macOS 10.14";
+        browserName = "Safari";
+        this.browserVersion = browserVersion;
+        safariOptions = new SafariOptions();
+        return this;
+    }
 }

common/src/test/java/com/saucelabs/common/acceptance/SauceSessionAcceptaceTest.java

@@ -1,5 +1,6 @@
 package com.saucelabs.common.acceptance;
 
+import com.saucelabs.remotedriver.SafariVersion;
 import com.saucelabs.remotedriver.SauceSession;
 import org.hamcrest.text.IsEqualIgnoringCase;
 import org.junit.After;
@@ -29,8 +30,14 @@ public void startSession_noSauceOptionsSet_returnsDriver() throws MalformedURLEx
 
     @Test
     public void getInstance_nonDefaultCapabilities_returnsCorrectDriver() throws MalformedURLException {
-        webDriver = new SauceSession().withFirefox().getInstance();
+        webDriver = new SauceSession().withFirefox().getWebDriver();
         String actualBrowser = (((RemoteWebDriver) webDriver).getCapabilities()).getBrowserName();
         assertThat(actualBrowser, IsEqualIgnoringCase.equalToIgnoringCase("firefox"));
     }
+    @Test
+    public void safari_osNotSet_returnsValidSafariSession() throws MalformedURLException {
+        webDriver = new SauceSession().withSafari(SafariVersion.elevenDotOne).getWebDriver();
+        String actualBrowser = (((RemoteWebDriver) webDriver).getCapabilities()).getBrowserName();
+        assertThat(actualBrowser, IsEqualIgnoringCase.equalToIgnoringCase("safari"));
+    }
 }

common/src/test/java/com/saucelabs/remotedriver/SauceSessionTest.java

@@ -2,18 +2,14 @@
 
 import org.hamcrest.text.IsEqualIgnoringCase;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.remote.RemoteWebDriver;
 
 import java.net.MalformedURLException;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
 
 public class SauceSessionTest {
 
@@ -40,8 +36,8 @@ public void defaultConstructor_instantiated_setsConcreteDriverManager()
 
     @Test
     public void getInstance_serverNotSet_setsSauceSeleniumServer() throws MalformedURLException {
-        RemoteDriverInterface stubRemoteManager = mock(RemoteDriverInterface.class);
-        sauceSession = new SauceSession(stubRemoteManager);
+        RemoteDriverInterface fakeRemoteDriver = mock(RemoteDriverInterface.class);
+        sauceSession = new SauceSession(fakeRemoteDriver);
         sauceSession.getInstanceOld();
         String expectedServer = "https://ondemand.saucelabs.com/wd/hub";
         assertEquals(expectedServer, sauceSession.seleniumServer);
@@ -73,18 +69,28 @@ public void sauceOptions_defaultConfiguration_setsSauceOptions()
     }
 
     @Test
-    @Ignore("Having trouble testing. How do we actually validate that what came back is" +
-        "what we want. Or is checking the set properties enough")
-    public void getInstance_default_returnsChromeBad() throws MalformedURLException {
-        RemoteDriverInterface stubRemoteManager = mock(RemoteDriverInterface.class);
-        Capabilities stubCaps = mock(Capabilities.class);
-        RemoteWebDriver remoteWebDriver = new RemoteWebDriver(stubCaps);
-        when(stubRemoteManager.getRemoteWebDriver(anyString(),anyObject())).thenReturn(remoteWebDriver);
-        sauceSession = new SauceSession(stubRemoteManager);
+    public void defaultSafari_notSet_returnsLatestVersion()
+    {
+        RemoteDriverInterface fakeRemoteDriver = mock(RemoteDriverInterface.class);
+        sauceSession = new SauceSession(fakeRemoteDriver);
+        sauceSession.withSafari(SafariVersion.elevenDotOne);
 
-        WebDriver driver = sauceSession.getInstance();
+        String safariVersion = sauceSession.getCapabilities().getVersion();
 
-        String actualBrowser = (((RemoteWebDriver) driver).getCapabilities()).getBrowserName();
-        assertThat(actualBrowser, IsEqualIgnoringCase.equalToIgnoringCase("chrome"));
+        assertThat(safariVersion, IsEqualIgnoringCase.equalToIgnoringCase("latest"));
+    }
+    @Test
+    public void withSafari_browserName_setToSafari()
+    {
+        sauceSession.withSafari(SafariVersion.elevenDotOne);
+        String actualBrowserName = sauceSession.getCapabilities().getBrowserName();
+        assertThat(actualBrowserName, IsEqualIgnoringCase.equalToIgnoringCase("safari"));
+    }
+    @Test
+    public void safariVersion_changed_returnsCorrespondingVersion()
+    {
+        sauceSession.withSafari(SafariVersion.elevenDotOne);
+        String safariVersion = sauceSession.getCapabilities().getVersion();
+        assertThat(safariVersion, IsEqualIgnoringCase.equalToIgnoringCase("11.1"));
     }
 }