Executable path for PhantomJS

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py

@@ -243,7 +243,8 @@ def create_safari(self, desired_capabilities, remote_url, options=None, service_
             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):
+    def create_phantomjs(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                         executable_path='phantomjs'):
         warnings.warn('SeleniumLibrary support for PhantomJS has been deprecated, '
                       'please use headlesschrome or headlessfirefox instead.')
         if is_truthy(remote_url):
@@ -252,7 +253,10 @@ def create_phantomjs(self, desired_capabilities, remote_url, options=None, servi
             return self._remote(desired_capabilities, remote_url)
         if options:
             logger.warn('PhantomJS browser does not support Selenium options.')
-        return webdriver.PhantomJS(service_log_path=service_log_path, **desired_capabilities)
+        if is_falsy(executable_path):
+            executable_path = self._get_executable_path(webdriver.PhantomJS)
+        return webdriver.PhantomJS(service_log_path=service_log_path, executable_path=executable_path,
+                                   **desired_capabilities)
 
     def create_htmlunit(self, desired_capabilities, remote_url, options=None, service_log_path=None):
         if service_log_path or options:

utest/test/keywords/test_selenium_options_parser.py

@@ -388,7 +388,8 @@ def test_create_safari_no_options_support(creator):
 def test_create_phantomjs_no_options_support(creator):
     options = mock()
     expected_webdriver = mock()
-    when(webdriver).PhantomJS(service_log_path=None).thenReturn(expected_webdriver)
+    executable_path = 'phantomjs'
+    when(webdriver).PhantomJS(service_log_path=None, executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.create_phantomjs({}, None, options=options)
     assert driver == expected_webdriver
 

utest/test/keywords/test_webdrivercreator.py

@@ -526,7 +526,8 @@ def test_safari_no_broser_name(creator):
 
 def test_phantomjs(creator):
     expected_webdriver = mock()
-    when(webdriver).PhantomJS(service_log_path=None).thenReturn(expected_webdriver)
+    executable_path = 'phantomjs'
+    when(webdriver).PhantomJS(service_log_path=None, executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.create_phantomjs({}, None)
     assert driver == expected_webdriver
 

utest/test/keywords/test_webdrivercreator_executable_path.py

@@ -225,6 +225,23 @@ def test_create_safari_executable_path_not_set(creator):
     assert driver == expected_webdriver
 
 
+def test_create_phantomjs_executable_path_set(creator):
+    executable_path = '/path/to/phantomjs'
+    expected_webdriver = mock()
+    when(webdriver).PhantomJS(service_log_path=None, executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_phantomjs({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_phantomjs_executable_path_not_set(creator):
+    executable_path = 'phantomjs'
+    expected_webdriver = mock()
+    when(creator)._get_executable_path(ANY).thenReturn(executable_path)
+    when(webdriver).PhantomJS(service_log_path=None, executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_phantomjs({}, 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

@@ -168,6 +168,7 @@ def test_create_safari_no_support_for_service_log_path(creator):
 def test_create_phantomjs_with_service_log_path_real_path(creator):
     log_file = os.path.join(creator.output_dir, 'ie-1.log')
     expected_webdriver = mock()
-    when(webdriver).PhantomJS(service_log_path=log_file).thenReturn(expected_webdriver)
+    executable_path = 'phantomjs'
+    when(webdriver).PhantomJS(service_log_path=log_file, executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.creator.create_phantomjs({}, None, service_log_path=log_file)
     assert driver == expected_webdriver