htmlunit, android and iphone should set the desired capabilities by default (#1260)

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools.py

@@ -156,15 +156,23 @@ def create_phantomjs(self, desired_capabilities, remote_url):
         return webdriver.PhantomJS(**desired_capabilities)
 
     def create_htmlunit(self, desired_capabilities, remote_url):
+        if not desired_capabilities:
+            desired_capabilities['desired_capabilities'] = webdriver.DesiredCapabilities.HTMLUNIT
         return self._remote(desired_capabilities, remote_url)
 
     def create_htmlunit_with_js(self, desired_capabilities, remote_url):
+        if not desired_capabilities:
+            desired_capabilities['desired_capabilities'] = webdriver.DesiredCapabilities.HTMLUNITWITHJS
         return self._remote(desired_capabilities, remote_url)
 
     def create_android(self, desired_capabilities, remote_url):
+        if not desired_capabilities:
+            desired_capabilities['desired_capabilities'] = webdriver.DesiredCapabilities.ANDROID
         return self._remote(desired_capabilities, remote_url)
 
     def create_iphone(self, desired_capabilities, remote_url):
+        if not desired_capabilities:
+            desired_capabilities['desired_capabilities'] = webdriver.DesiredCapabilities.IPHONE
         return self._remote(desired_capabilities, remote_url)
 
     def _remote(self, desired_capabilities, remote_url,

utest/test/keywords/test_webdrivercreator.py

@@ -252,32 +252,40 @@ def test_phantomjs_remote(self):
         self.assertEqual(driver, expected_webdriver)
 
     def test_htmlunit(self):
+        caps = webdriver.DesiredCapabilities.HTMLUNIT
         expected_webdriver = mock()
         when(webdriver).Remote(command_executor='None',
+                               desired_capabilities=caps,
                                browser_profile=None,
                                options=None).thenReturn(expected_webdriver)
         driver = self.creator.create_htmlunit({}, None)
         self.assertEqual(driver, expected_webdriver)
 
     def test_htmlunit_with_js(self):
+        caps = webdriver.DesiredCapabilities.HTMLUNITWITHJS
         expected_webdriver = mock()
         when(webdriver).Remote(command_executor='None',
+                               desired_capabilities=caps,
                                browser_profile=None,
                                options=None).thenReturn(expected_webdriver)
         driver = self.creator.create_htmlunit_with_js({}, None)
         self.assertEqual(driver, expected_webdriver)
 
     def test_android(self):
+        caps = webdriver.DesiredCapabilities.ANDROID
         expected_webdriver = mock()
         when(webdriver).Remote(command_executor='None',
+                               desired_capabilities=caps,
                                browser_profile=None,
                                options=None).thenReturn(expected_webdriver)
         driver = self.creator.create_android({}, None)
         self.assertEqual(driver, expected_webdriver)
 
     def test_iphone(self):
+        caps = webdriver.DesiredCapabilities.IPHONE
         expected_webdriver = mock()
         when(webdriver).Remote(command_executor='None',
+                               desired_capabilities=caps,
                                browser_profile=None,
                                options=None).thenReturn(expected_webdriver)
         driver = self.creator.create_iphone({}, None)