Fixed service_log_path for Firefox and older Selenium version (#1422)

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py

@@ -123,13 +123,17 @@ def create_headless_chrome(self, desired_capabilities, remote_url, options=None,
     def create_firefox(self, desired_capabilities, remote_url, ff_profile_dir, options=None, service_log_path=None):
         profile = self._get_ff_profile(ff_profile_dir)
         if is_truthy(remote_url):
-            defaul_caps = webdriver.DesiredCapabilities.FIREFOX.copy()
-            desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
+            default_caps = webdriver.DesiredCapabilities.FIREFOX.copy()
+            desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, default_caps)
             return self._remote(desired_capabilities, remote_url,
                                 profile, options)
         service_log_path = service_log_path if service_log_path else self._geckodriver_log
-        return webdriver.Firefox(options=options, firefox_profile=profile, service_log_path=service_log_path,
-                                 **desired_capabilities)
+        if self._has_service_log_path(webdriver.Firefox):
+            # service_log_path is supported from Selenium 3.14 onwards
+            # If can be removed when minimum Selenium version is 3.14.0 or greater
+            return webdriver.Firefox(options=options, firefox_profile=profile,
+                                     service_log_path=service_log_path, **desired_capabilities)
+        return webdriver.Firefox(options=options, firefox_profile=profile, **desired_capabilities)
 
     def _get_ff_profile(self, ff_profile_dir):
         if isinstance(ff_profile_dir, FirefoxProfile):

utest/test/keywords/test_selenium_options_parser.py

@@ -195,6 +195,7 @@ def test_create_firefox_with_options(self):
         when(webdriver).FirefoxProfile().thenReturn(profile)
         when(webdriver).Firefox(options=options, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_firefox({}, None, None, options=options)
         self.assertEqual(driver, expected_webdriver)
 
@@ -221,6 +222,7 @@ def test_create_headless_firefox_with_options(self):
         when(webdriver).FirefoxProfile().thenReturn(profile)
         when(webdriver).Firefox(options=options, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_headless_firefox({}, None, None, options=options)
         self.assertEqual(driver, expected_webdriver)
 
@@ -374,6 +376,7 @@ def test_create_driver_firefox(self):
         when(webdriver).FirefoxProfile().thenReturn(profile)
         expected_webdriver = mock()
         when(self.creator.selenium_options).create('firefox', str_options).thenReturn(options)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         when(webdriver).Firefox(options=options, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
         driver = self.creator.create_driver('FireFox', desired_capabilities={}, remote_url=None,

utest/test/keywords/test_webdrivercreator.py

@@ -194,6 +194,7 @@ def test_firefox(self):
         when(webdriver).Firefox(options=None,
                                 firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_firefox({}, None, None)
         self.assertEqual(driver, expected_webdriver)
         verify(webdriver).FirefoxProfile()
@@ -266,6 +267,7 @@ def test_firefox_profile(self):
         log_file = self.get_geckodriver_log()
         when(webdriver).Firefox(options=None, service_log_path=log_file,
                                 firefox_profile=profile).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_firefox({}, None, profile_dir)
         self.assertEqual(driver, expected_webdriver)
 
@@ -278,6 +280,7 @@ def test_firefox_headless(self):
         log_file = self.get_geckodriver_log()
         when(webdriver).Firefox(options=options, service_log_path=log_file,
                                 firefox_profile=profile).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_headless_firefox({}, None, None)
         self.assertEqual(driver, expected_webdriver)
 
@@ -634,6 +637,7 @@ def test_create_driver_firefox(self):
         log_file = self.get_geckodriver_log()
         when(webdriver).Firefox(options=None, service_log_path=log_file,
                                 firefox_profile=profile).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         for browser in ['ff', 'firefox']:
             driver = self.creator.create_driver(browser, None, None, None)
             self.assertEqual(driver, expected_webdriver)

utest/test/keywords/test_webdrivercreator_service_log_path.py

@@ -70,6 +70,7 @@ def test_create_firefox_with_service_log_path_none(self):
         when(webdriver).FirefoxProfile().thenReturn(profile)
         when(webdriver).Firefox(options=None, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_firefox({}, None, None, service_log_path=None)
         self.assertEqual(driver, expected_webdriver)
 
@@ -80,9 +81,19 @@ def test_create_firefox_with_service_log_path_real_path(self):
         when(webdriver).FirefoxProfile().thenReturn(profile)
         when(webdriver).Firefox(options=None, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_firefox({}, None, ff_profile_dir=None, service_log_path=log_file)
         self.assertEqual(driver, expected_webdriver)
 
+    def test_create_firefox_with_older_selenium(self):
+        when(self.creator)._has_service_log_path(ANY).thenReturn(False)
+        expected_webdriver = mock()
+        profile = mock()
+        when(webdriver).FirefoxProfile().thenReturn(profile)
+        when(webdriver).Firefox(options=None, firefox_profile=profile).thenReturn(expected_webdriver)
+        driver = self.creator.create_firefox({}, None, ff_profile_dir=None)
+        self.assertEqual(driver, expected_webdriver)
+
     def test_create_headlessfirefox_with_service_log_path_real_path(self):
         log_file = os.path.join(self.output_dir, 'firefox-{index}.log')
         expected_webdriver = mock()
@@ -92,6 +103,7 @@ def test_create_headlessfirefox_with_service_log_path_real_path(self):
         when(webdriver).FirefoxOptions().thenReturn(options)
         when(webdriver).Firefox(options=options, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_headless_firefox({}, None, ff_profile_dir=None, service_log_path=log_file)
         self.assertEqual(driver, expected_webdriver)
 
@@ -104,6 +116,7 @@ def test_create_firefox_from_create_driver(self):
         when(webdriver).FirefoxOptions().thenReturn(options)
         when(webdriver).Firefox(options=None, firefox_profile=profile,
                                 service_log_path=log_file).thenReturn(expected_webdriver)
+        when(self.creator)._has_service_log_path(ANY).thenReturn(True)
         driver = self.creator.create_driver('firefox ', {}, remote_url=None,  profile_dir=None,
                                             service_log_path=log_file)
         self.assertEqual(driver, expected_webdriver)