Fix firefox initialization error using Selenium 2.X

Telefonica · Mar 23, 2017 · 9290d3f · 9290d3f
1 parent 576563e
commit 9290d3f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Toolium Changelog
 =================
 
+v1.2.5
+------
+
+*In development*
+
+- Fix firefox initialization error using Selenium 2.X
+
 v1.2.4
 ------
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5-dev
diff --git a/toolium/config_driver.py b/toolium/config_driver.py
@@ -216,8 +216,14 @@ def _setup_firefox(self, capabilities):
             firefox_options = None
 
         log_path = os.path.join(DriverWrappersPool.output_directory, 'geckodriver.log')
-        return webdriver.Firefox(firefox_profile=self._create_firefox_profile(), capabilities=capabilities,
-                                 executable_path=gecko_driver, firefox_options=firefox_options, log_path=log_path)
+        try:
+            # Selenium 3
+            return webdriver.Firefox(firefox_profile=self._create_firefox_profile(), capabilities=capabilities,
+                                     executable_path=gecko_driver, firefox_options=firefox_options, log_path=log_path)
+        except TypeError:
+            # Selenium 2
+            return webdriver.Firefox(firefox_profile=self._create_firefox_profile(), capabilities=capabilities,
+                                     executable_path=gecko_driver, firefox_options=firefox_options)
 
     def _create_firefox_profile(self):
         """Create and configure a firefox profile