update selenium

sdpython · Jul 12, 2016 · 7f93869 · 7f93869
1 parent 961962d
commit 7f93869
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 28 deletions.
diff --git a/_doc/sphinxdoc/source/conf_base.py b/_doc/sphinxdoc/source/conf_base.py
@@ -91,7 +91,7 @@
             \\newcommand{\\trace}[1]{tr\\pa{#1}}
             \\newcommand{\\abs}[1]{\\left|#1\\right|}
             """
-            #\\usepackage{eepic}
+#\\usepackage{eepic}
 
 project_var_name_t = "ENSAE<br />Xavier Dupré"
 project_var_name = "ensae_teaching_cs"

diff --git a/_unittests/ut_faq/test_LONG_faq_web_selenium.py b/_unittests/ut_faq/test_LONG_faq_web_selenium.py
@@ -59,7 +59,7 @@
 
 class TestLONGFaqWeb(unittest.TestCase):
 
-    def test_selenium_html(self):
+    def _test_selenium_html(self):
         fLOG(
             __file__,
             self._testMethodName,
@@ -75,7 +75,7 @@ def test_selenium_html(self):
         if "href" not in html[0][1]:
             raise Exception(html)
 
-        html = webhtml(url, module='splinter')
+        html = webhtml(url) #module='splinter')
         assert len(html) > 0
         self.assertEqual(len(html[0]), 2)
         if "href" not in html[0][1]:

diff --git a/src/ensae_teaching_cs/faq/faq_web.py b/src/ensae_teaching_cs/faq/faq_web.py
@@ -61,18 +61,7 @@ def webshot(img, url, navigator="firefox", add_date=False,
 
     res = []
     if module == "selenium":
-        from selenium import webdriver
-
-        if navigator == "firefox":
-            browser = webdriver.Firefox()
-        elif navigator == "chrome":
-            browser = webdriver.Chrome()
-        elif navigator == "ie":
-            browser = webdriver.Ie()
-        elif navigator == "edge":
-            browser = webdriver.Edge()
-        else:
-            raise Exception("unable to interpret the navigator")
+        browser = _get_selenium_browser(navigator)
 
         if size is not None:
             browser.set_window_size(size[0], size[1])
@@ -123,6 +112,26 @@ def webshot(img, url, navigator="firefox", add_date=False,
     return res
 
 
+def _get_selenium_browser(navigator):
+    from selenium import webdriver
+    from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+
+    if navigator == "firefox":
+        firefox_capabilities = DesiredCapabilities.FIREFOX.copy()
+        firefox_capabilities['marionette'] = True
+        browser = webdriver.Firefox(capabilities=firefox_capabilities,
+                                    firefox_binary=r"C:\Program Files (x86)\Mozilla Firefox\firefox.exe")
+    elif navigator == "chrome":
+        browser = webdriver.Chrome()
+    elif navigator == "ie":
+        browser = webdriver.Ie()
+    elif navigator == "edge":
+        browser = webdriver.Edge()
+    else:
+        raise Exception("unable to interpret the navigator")
+    return browser
+
+
 def webhtml(url, navigator="firefox", module="selenium"):
     """
     Uses the modules `selenium <http://selenium-python.readthedocs.io/>`_ to retrieve the html of a website
@@ -147,19 +156,7 @@ def webhtml(url, navigator="firefox", module="selenium"):
 
     res = []
     if module == "selenium":
-        from selenium import webdriver
-
-        if navigator == "firefox":
-            browser = webdriver.Firefox()
-        elif navigator == "chrome":
-            browser = webdriver.Chrome()
-        elif navigator == "ie":
-            browser = webdriver.Ie()
-        elif navigator == "edge":
-            browser = webdriver.Edge()
-        else:
-            raise Exception("unable to interpret the navigator")
-
+        browser = _get_selenium_browser(navigator)
         if not isinstance(url, list):
             url = [url]
         for u in url: