Add support for Safari Technology Preview to python bindings

py/selenium/webdriver/safari/service.py

@@ -25,16 +25,15 @@ class Service(service.Service):
     Object that manages the starting and stopping of the SafariDriver
     """
 
-    def __init__(self, port=0, quiet=False):
+    def __init__(self, executable_path, port=0, quiet=False):
         """
         Creates a new instance of the Service
 
         :Args:
          - executable_path : Path to the SafariDriver
          - port : Port the service is running on """
 
-        path = '/usr/bin/safaridriver'
-        if not os.path.exists(path):
+        if not os.path.exists(executable_path):
             raise Exception("SafariDriver requires Safari 10 on OSX El Capitan or greater")
 
         if port == 0:
@@ -44,7 +43,7 @@ def __init__(self, port=0, quiet=False):
         log = PIPE
         if quiet:
             log = open(os.devnull, 'w')
-        service.Service.__init__(self, path, port, log)
+        service.Service.__init__(self, executable_path, port, log)
 
     def command_line_args(self):
         return ["-p", "%s" % self.port]

py/selenium/webdriver/safari/webdriver.py

@@ -32,7 +32,8 @@ class WebDriver(RemoteWebDriver):
 
     """
 
-    def __init__(self, port=0, desired_capabilities=DesiredCapabilities.SAFARI, quiet=False):
+    def __init__(self, port=0, executable_path="/usr/bin/safaridriver",
+                 desired_capabilities=DesiredCapabilities.SAFARI, quiet=False):
         """
         Creates a new instance of the Safari driver.
 
@@ -43,7 +44,7 @@ def __init__(self, port=0, desired_capabilities=DesiredCapabilities.SAFARI, quie
          - desired_capabilities: Dictionary object with desired capabilities (Can be used to provide various Safari switches).
          - quiet - set to True to suppress stdout and stderr of the driver
         """
-        self.service = Service(port=port, quiet=quiet)
+        self.service = Service(executable_path, port=port, quiet=quiet)
         self.service.start()
 
         RemoteWebDriver.__init__(

py/test/selenium/webdriver/safari/conftest.py

@@ -0,0 +1,37 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+
+from selenium.webdriver import Safari
+
+
+@pytest.fixture
+def driver_class():
+    return Safari
+
+
+@pytest.fixture
+def driver_kwargs():
+    return {}
+
+
+@pytest.fixture
+def driver(driver_class, driver_kwargs):
+    driver = driver_class(**driver_kwargs)
+    yield driver
+    driver.quit()

py/test/selenium/webdriver/safari/launcher_tests.py

@@ -0,0 +1,44 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import os
+
+import pytest
+
+
+def test_launch(driver):
+    assert driver.capabilities['browserName'] == 'safari'
+
+
+def test_launch_with_invalid_executable_path_raises_exception(driver_class):
+    path = '/this/path/should/never/exist'
+    assert not os.path.exists(path)
+    with pytest.raises(Exception) as e:
+        driver_class(executable_path=path)
+    assert 'SafariDriver requires Safari 10 on OSX El Capitan' in str(e)
+
+
+class TestTechnologyPreview(object):
+
+    @pytest.fixture
+    def driver_kwargs(self):
+        path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
+        assert os.path.exists(path), 'Safari Technology Preview required! Download it from https://developer.apple.com/safari/technology-preview/'
+        return {'executable_path': path}
+
+    def test_launch(self, driver):
+        assert driver.capabilities['browserName'] == 'safari'