Remote browsers

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py

@@ -258,30 +258,34 @@ def create_phantomjs(self, desired_capabilities, remote_url, options=None, servi
         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:
-            logger.warn('Htmlunit does not support Selenium options or service_log_path argument.')
+    def create_htmlunit(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                        executable_path=None):
+        if service_log_path or options or executable_path:
+            logger.warn('Htmlunit does not support Selenium options, service_log_path or executable_path argument.')
         defaul_caps = webdriver.DesiredCapabilities.HTMLUNIT.copy()
         desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
         return self._remote(desired_capabilities, remote_url, options=options)
 
-    def create_htmlunit_with_js(self, desired_capabilities, remote_url, options=None, service_log_path=None):
-        if service_log_path or options:
-            logger.warn('Htmlunit with JS does not support service_log_path argument.')
+    def create_htmlunit_with_js(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                                executable_path=None):
+        if service_log_path or options or executable_path:
+            logger.warn('Htmlunit with JS does not support Selenium options, service_log_path or executable_path argument.')
         defaul_caps = webdriver.DesiredCapabilities.HTMLUNITWITHJS.copy()
         desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
         return self._remote(desired_capabilities, remote_url, options=options)
 
-    def create_android(self, desired_capabilities, remote_url, options=None, service_log_path=None):
-        if service_log_path:
-            logger.warn('Android does not support service_log_path argument.')
+    def create_android(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                       executable_path=None):
+        if service_log_path or executable_path:
+            logger.warn('Android does not support Selenium options or executable_path argument.')
         defaul_caps = webdriver.DesiredCapabilities.ANDROID.copy()
         desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
         return self._remote(desired_capabilities, remote_url, options=options)
 
-    def create_iphone(self, desired_capabilities, remote_url, options=None, service_log_path=None):
-        if service_log_path:
-            logger.warn('iPhone does not support service_log_path argument.')
+    def create_iphone(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                      executable_path=None):
+        if service_log_path or executable_path:
+            logger.warn('iPhone does not support service_log_path or executable_path argument.')
         defaul_caps = webdriver.DesiredCapabilities.IPHONE.copy()
         desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
         return self._remote(desired_capabilities, remote_url, options=options)

utest/test/keywords/test_webdrivercreator_executable_path.py

@@ -242,6 +242,58 @@ def test_create_phantomjs_executable_path_not_set(creator):
     assert driver == expected_webdriver
 
 
+def test_create_htmlunit_executable_path_set(creator):
+    executable_path = 'path/to/bin'
+    caps = webdriver.DesiredCapabilities.HTMLUNIT.copy()
+    expected_webdriver = mock()
+    file_detector = mock_file_detector(creator)
+    when(webdriver).Remote(command_executor='None',
+                           desired_capabilities=caps,
+                           browser_profile=None, options=None,
+                           file_detector=file_detector).thenReturn(expected_webdriver)
+    driver = creator.create_htmlunit({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_htmlunit_with_js_executable_path_set(creator):
+    executable_path = 'path/to/bin'
+    caps = webdriver.DesiredCapabilities.HTMLUNITWITHJS.copy()
+    expected_webdriver = mock()
+    file_detector = mock_file_detector(creator)
+    when(webdriver).Remote(command_executor='None',
+                           desired_capabilities=caps,
+                           browser_profile=None, options=None,
+                           file_detector=file_detector).thenReturn(expected_webdriver)
+    driver = creator.create_htmlunit_with_js({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_android_executable_path_set(creator):
+    executable_path = 'path/to/bin'
+    caps = webdriver.DesiredCapabilities.ANDROID.copy()
+    expected_webdriver = mock()
+    file_detector = mock_file_detector(creator)
+    when(webdriver).Remote(command_executor='None',
+                           desired_capabilities=caps,
+                           browser_profile=None, options=None,
+                           file_detector=file_detector).thenReturn(expected_webdriver)
+    driver = creator.create_android({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_iphone_executable_path_set(creator):
+    executable_path = 'path/to/bin'
+    caps = webdriver.DesiredCapabilities.IPHONE.copy()
+    expected_webdriver = mock()
+    file_detector = mock_file_detector(creator)
+    when(webdriver).Remote(command_executor='None',
+                           desired_capabilities=caps,
+                           browser_profile=None, options=None,
+                           file_detector=file_detector).thenReturn(expected_webdriver)
+    driver = creator.create_iphone({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
 def mock_file_detector(creator):
     file_detector = mock()
     when(creator)._get_sl_file_detector().thenReturn(file_detector)