Executable path for Safari

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py

@@ -231,14 +231,17 @@ def create_opera(self, desired_capabilities, remote_url, options=None, service_l
         return webdriver.Opera(options=options, service_log_path=service_log_path, executable_path=executable_path,
                                **desired_capabilities)
 
-    def create_safari(self, desired_capabilities, remote_url, options=None, service_log_path=None):
+    def create_safari(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                      executable_path='/usr/bin/safaridriver'):
         if is_truthy(remote_url):
             defaul_caps = webdriver.DesiredCapabilities.SAFARI.copy()
             desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
             return self._remote(desired_capabilities, remote_url)
         if options or service_log_path:
             logger.warn('Safari browser does not support Selenium options or service_log_path.')
-        return webdriver.Safari(**desired_capabilities)
+        if is_falsy(executable_path):
+            executable_path = self._get_executable_path(webdriver.Safari)
+        return webdriver.Safari(executable_path=executable_path, **desired_capabilities)
 
     def create_phantomjs(self, desired_capabilities, remote_url, options=None, service_log_path=None):
         warnings.warn('SeleniumLibrary support for PhantomJS has been deprecated, '

utest/test/keywords/test_selenium_options_parser.py

@@ -379,7 +379,8 @@ def test_create_opera_with_options_and_remote_url(creator):
 def test_create_safari_no_options_support(creator):
     options = mock()
     expected_webdriver = mock()
-    when(webdriver).Safari().thenReturn(expected_webdriver)
+    executable_path = '/usr/bin/safaridriver'
+    when(webdriver).Safari(executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.create_safari({}, None, options=options)
     assert driver == expected_webdriver
 

utest/test/keywords/test_webdrivercreator.py

@@ -483,7 +483,8 @@ def test_opera_no_browser_name(creator):
 
 def test_safari(creator):
     expected_webdriver = mock()
-    when(webdriver).Safari().thenReturn(expected_webdriver)
+    executable_path = '/usr/bin/safaridriver'
+    when(webdriver).Safari(executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.create_safari({}, None)
     assert driver == expected_webdriver
 

utest/test/keywords/test_webdrivercreator_executable_path.py

@@ -208,6 +208,23 @@ def test_create_opera_executable_path_not_set(creator):
     assert driver == expected_webdriver
 
 
+def test_create_safari_executable_path_set(creator):
+    executable_path = '/path/to/safaridriver'
+    expected_webdriver = mock()
+    when(webdriver).Safari(executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_safari({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_safari_executable_path_not_set(creator):
+    executable_path = '/usr/bin/safaridriver'
+    expected_webdriver = mock()
+    when(creator)._get_executable_path(ANY).thenReturn(executable_path)
+    when(webdriver).Safari(executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_safari({}, None, executable_path=None)
+    assert driver == expected_webdriver
+
+
 def mock_file_detector(creator):
     file_detector = mock()
     when(creator)._get_sl_file_detector().thenReturn(file_detector)

utest/test/keywords/test_webdrivercreator_service_log_path.py

@@ -159,7 +159,8 @@ def test_create_opera_with_service_log_path_real_path(creator):
 def test_create_safari_no_support_for_service_log_path(creator):
     log_file = os.path.join(creator.output_dir, 'ie-1.log')
     expected_webdriver = mock()
-    when(webdriver).Safari().thenReturn(expected_webdriver)
+    executable_path = '/usr/bin/safaridriver'
+    when(webdriver).Safari(executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.creator.create_safari({}, None, service_log_path=log_file)
     assert driver == expected_webdriver