Merge pull request #936 from seleniumbase/a-few-updates

mdmintz · web-flow · commit 5ad7a8c1c5da · 2021-07-12T01:25:02.000-04:00
Some updates to driver downloads and loading external JS resources
diff --git a/Dockerfile b/Dockerfile
@@ -84,8 +84,18 @@ RUN pip3 install --upgrade setuptools
 RUN pip3 install --upgrade setuptools-scm
 RUN cd /SeleniumBase && ls && pip3 install -r requirements.txt --upgrade
 RUN cd /SeleniumBase && python3 setup.py develop
-RUN seleniumbase install chromedriver
-RUN seleniumbase install geckodriver
+
+#=====================
+# Download WebDrivers
+#=====================
+RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.29.1/geckodriver-v0.29.1-linux32.tar.gz
+RUN tar -xvzf geckodriver-v0.29.1-linux32.tar.gz
+RUN chmod +x geckodriver
+RUN mv geckodriver /usr/local/bin/
+RUN wget https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip
+RUN unzip chromedriver_linux64.zip
+RUN mv chromedriver /usr/local/bin/
+RUN chmod +x /usr/bin/chromedriver
 
 #==========================================
 # Create entrypoint and grab example tests
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -5,6 +5,7 @@ joblib==1.0.1;python_version>="3.6"
 Markdown==3.3.4;python_version>="3.6"
 MarkupSafe==2.0.1;python_version>="3.6"
 docutils==0.17.1
+pkginfo==1.7.1;python_version>="3.6"
 Jinja2==3.0.1;python_version>="3.6"
 click==8.0.1;python_version>="3.6"
 zipp==3.5.0;python_version>="3.6"
diff --git a/examples/parameterized_test.py b/examples/parameterized_test.py
@@ -6,7 +6,7 @@ class GoogleTests(BaseCase):
     @parameterized.expand(
         [
             ["PyPI", "pypi.org", 'img[alt="PyPI"]'],
-            ["Wikipedia", "wikipedia.org", "img.central-featured-logo"],
+            ["Wikipedia", "www.wikipedia.org", "img.central-featured-logo"],
             ["SeleniumBase", "seleniumbase/SeleniumBase", 'img[title*="Sel"]'],
         ]
     )
diff --git a/help_docs/method_summary.md b/help_docs/method_summary.md
@@ -258,9 +258,11 @@ self.press_left_arrow(selector="html", times=1, by=By.CSS_SELECTOR)
 
 self.press_right_arrow(selector="html", times=1, by=By.CSS_SELECTOR)
 
-self.scroll_to(selector, by=By.CSS_SELECTOR)
+self.scroll_to(selector, by=By.CSS_SELECTOR, timeout=None)
+# Duplicates: self.scroll_to_element(selector, by=By.CSS_SELECTOR)
 
-self.slow_scroll_to(selector, by=By.CSS_SELECTOR)
+self.slow_scroll_to(selector, by=By.CSS_SELECTOR, timeout=None)
+# Duplicates: self.slow_scroll_to_element(selector, by=By.CSS_SELECTOR)
 
 self.scroll_to_top()
 
diff --git a/requirements.txt b/requirements.txt
@@ -84,11 +84,11 @@ pymysql==0.10.1;python_version<"3.6"
 pymysql==1.0.2;python_version>="3.6"
 pyotp==2.6.0
 boto==2.49.0
-cffi==1.14.5
+cffi==1.14.6
 toml==0.10.2
 Pillow==6.2.2;python_version<"3.5"
 Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"
-Pillow==8.3.0;python_version>="3.6"
+Pillow==8.3.1;python_version>="3.6"
 rich==10.5.0;python_version>="3.6" and python_version<"4.0"
 tornado==5.1.1;python_version<"3.5"
 tornado==6.1;python_version>="3.5"
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.63.14"
+__version__ = "1.63.15"
diff --git a/seleniumbase/console_scripts/run.py b/seleniumbase/console_scripts/run.py
@@ -120,12 +120,12 @@ def show_install_usage():
     print("           sbase install chromedriver")
     print("           sbase install geckodriver")
     print("           sbase install edgedriver")
-    print("           sbase install chromedriver 89")
-    print("           sbase install chromedriver 89.0.4389.23")
+    print("           sbase install chromedriver 91")
+    print("           sbase install chromedriver 91.0.4472.101")
     print("           sbase install chromedriver latest")
     print("           sbase install chromedriver -p")
     print("           sbase install chromedriver latest -p")
-    print("           sbase install edgedriver 89.0.774.54")
+    print("           sbase install edgedriver 91.0.864.67")
     print("  Output:")
     print("           Installs the chosen webdriver to seleniumbase/drivers/")
     print("           (chromedriver is required for Chrome automation)")
diff --git a/seleniumbase/console_scripts/sb_install.py b/seleniumbase/console_scripts/sb_install.py
@@ -13,12 +13,12 @@
         sbase install chromedriver
         sbase install geckodriver
         sbase install edgedriver
-        sbase install chromedriver 89.0.4389.23
-        sbase install chromedriver 89
+        sbase install chromedriver 91.0.4472.101
+        sbase install chromedriver 91
         sbase install chromedriver latest
         sbase install chromedriver -p
         sbase install chromedriver latest -p
-        sbase install edgedriver 89.0.774.54
+        sbase install edgedriver 91.0.864.67
 Output:
         Installs the chosen webdriver to seleniumbase/drivers/
         (chromedriver is required for Chrome automation)
@@ -85,6 +85,17 @@ def make_executable(file_path):
     os.chmod(file_path, mode)
 
 
+def requests_get(url):
+    response = None
+    try:
+        response = requests.get(url)
+    except Exception:
+        # Prevent SSLCertVerificationError / CERTIFICATE_VERIFY_FAILED
+        url = url.replace("https://", "http://")
+        response = requests.get(url)
+    return response
+
+
 def main(override=None):
     if override == "chromedriver":
         sys.argv = ["seleniumbase", "install", "chromedriver"]
@@ -163,22 +174,24 @@ def main(override=None):
             file_name = "chromedriver_linux64.zip"
         elif "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
             file_name = "chromedriver_win32.zip"  # Works for win32 / win_x64
+            if not get_latest and not get_v_latest and num_args < 4:
+                get_latest = True
         else:
             raise Exception(
                 "Cannot determine which version of chromedriver to download!"
             )
         found_chromedriver = False
         if get_latest:
-            url_request = requests.get(last)
+            url_request = requests_get(last)
             if url_request.ok:
                 found_chromedriver = True
                 use_version = url_request.text
         elif get_v_latest:
-            url_req = requests.get(last)
+            url_req = requests_get(last)
             if url_req.ok:
                 latest_version = url_req.text
             last = last + "_" + use_version
-            url_request = requests.get(last)
+            url_request = requests_get(last)
             if url_request.ok:
                 found_chromedriver = True
                 use_version = url_request.text
@@ -190,12 +203,12 @@ def main(override=None):
         )
         url_request = None
         if not found_chromedriver:
-            url_req = requests.get(last)
+            url_req = requests_get(last)
             if url_req.ok:
                 latest_version = url_req.text
                 if use_version == latest_version:
                     get_latest = True
-            url_request = requests.get(download_url)
+            url_request = requests_get(download_url)
         if found_chromedriver or url_request.ok:
             p_version = use_version
             p_version = c3 + use_version + cr
@@ -226,7 +239,7 @@ def main(override=None):
                         "https://api.github.com/repos/"
                         "mozilla/geckodriver/releases/latest"
                     )
-                    url_request = requests.get(last)
+                    url_request = requests_get(last)
                     if url_request.ok:
                         found_geckodriver = True
                         use_version = url_request.json()["tag_name"]
@@ -260,7 +273,7 @@ def main(override=None):
         )
         url_request = None
         if not found_geckodriver:
-            url_request = requests.get(download_url)
+            url_request = requests_get(download_url)
         if found_geckodriver or url_request.ok:
             msg = c2 + "geckodriver version for download" + cr
             p_version = c3 + use_version + cr
diff --git a/seleniumbase/core/tour_helper.py b/seleniumbase/core/tour_helper.py
@@ -192,7 +192,7 @@ def is_introjs_activated(driver):
 
 def activate_shepherd(driver):
     """Allows you to use Shepherd Tours with SeleniumBase
-    http://github.hubspot.com/shepherd/docs/welcome/
+    https://cdnjs.com/libraries/shepherd/1.8.1
     """
     shepherd_js = constants.Shepherd.MIN_JS
     sh_theme_arrows_css = constants.Shepherd.THEME_ARROWS_CSS
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
@@ -2948,6 +2948,9 @@ def scroll_to(self, selector, by=By.CSS_SELECTOR, timeout=None):
             )
             self.__scroll_to_element(element, selector, by)
 
+    def scroll_to_element(self, selector, by=By.CSS_SELECTOR, timeout=None):
+        self.scroll_to(selector, by=by, timeout=timeout)
+
     def slow_scroll_to(self, selector, by=By.CSS_SELECTOR, timeout=None):
         """ Slow motion scroll to destination """
         self.__check_scope()
@@ -2975,6 +2978,11 @@ def slow_scroll_to(self, selector, by=By.CSS_SELECTOR, timeout=None):
             )
             self.__slow_scroll_to_element(element)
 
+    def slow_scroll_to_element(
+        self, selector, by=By.CSS_SELECTOR, timeout=None
+    ):
+        self.slow_scroll_to(selector, by=by, timeout=timeout)
+
     def scroll_to_top(self):
         """ Scroll to the top of the page. """
         self.__check_scope()
diff --git a/seleniumbase/fixtures/js_utils.py b/seleniumbase/fixtures/js_utils.py
@@ -117,13 +117,30 @@ def wait_for_jquery_active(driver, timeout=None):
 
 
 def raise_unable_to_load_jquery_exception(driver):
-    """ The most-likely reason for jQuery not loading on web pages. """
-    raise Exception(
-        """Unable to load jQuery on "%s" due to a possible violation """
-        """of the website's Content Security Policy directive. """
-        """To override this policy, add "--disable-csp" on the """
-        """command-line when running your tests.""" % driver.current_url
-    )
+    has_csp_error = False
+    csp_violation = "violates the following Content Security Policy directive"
+    browser_logs = []
+    try:
+        browser_logs = driver.get_log("browser")
+    except (ValueError, WebDriverException):
+        pass
+    for entry in browser_logs:
+        if entry["level"] == "SEVERE":
+            if csp_violation in entry["message"]:
+                has_csp_error = True
+    if has_csp_error:
+        raise Exception(
+            """Unable to load jQuery on "%s" due to a violation """
+            """of the website's Content Security Policy directive. """
+            """To override this policy, add "--disable-csp" on the """
+            """command-line when running your tests.""" % driver.current_url
+        )
+    else:
+        raise Exception(
+            """Unable to load jQuery on "%s" because this website """
+            """restricts external JavaScript resources from loading."""
+            % driver.current_url
+        )
 
 
 def activate_jquery(driver):
@@ -138,12 +155,7 @@ def activate_jquery(driver):
         # jQuery is not currently defined. Let's proceed by defining it.
         pass
     jquery_js = constants.JQuery.MIN_JS
-    activate_jquery_script = (
-        """var script = document.createElement('script');"""
-        """script.src = "%s";document.getElementsByTagName('head')[0]"""
-        """.appendChild(script);""" % jquery_js
-    )
-    driver.execute_script(activate_jquery_script)
+    add_js_link(driver, jquery_js)
     for x in range(int(settings.MINI_TIMEOUT * 10.0)):
         # jQuery needs a small amount of time to activate.
         try:
@@ -152,7 +164,7 @@ def activate_jquery(driver):
         except Exception:
             time.sleep(0.1)
     try:
-        driver.execute_script(activate_jquery_script)
+        add_js_link(driver, jquery_js)
         time.sleep(0.1)
         driver.execute_script("jQuery('head');")
     except Exception:
@@ -349,13 +361,13 @@ def highlight_with_jquery(driver, selector, loops, o_bs):
 
 def add_css_link(driver, css_link):
     script_to_add_css = """function injectCSS(css) {
-          var head = document.getElementsByTagName("head")[0];
-          var link = document.createElement("link");
-          link.rel = "stylesheet";
-          link.type = "text/css";
-          link.href = css;
-          link.crossorigin = "anonymous";
-          head.appendChild(link);
+          var head_tag=document.getElementsByTagName("head")[0];
+          var link_tag=document.createElement("link");
+          link_tag.rel="stylesheet";
+          link_tag.type="text/css";
+          link_tag.href=css;
+          link_tag.crossorigin="anonymous";
+          head_tag.appendChild(link_tag);
        }
        injectCSS("%s");"""
     css_link = escape_quotes_if_needed(css_link)
@@ -364,14 +376,14 @@ def add_css_link(driver, css_link):
 
 def add_js_link(driver, js_link):
     script_to_add_js = """function injectJS(link) {
-          var body = document.getElementsByTagName("body")[0];
-          var script = document.createElement("script");
-          script.src = link;
-          script.defer;
-          script.type="text/javascript";
-          script.crossorigin = "anonymous";
-          script.onload = function() { null };
-          body.appendChild(script);
+          var body_tag=document.getElementsByTagName("body")[0];
+          var script_tag=document.createElement("script");
+          script_tag.src=link;
+          script_tag.type="text/javascript";
+          script_tag.crossorigin="anonymous";
+          script_tag.defer;
+          script_tag.onload=function() { null };
+          body_tag.appendChild(script_tag);
        }
        injectJS("%s");"""
     js_link = escape_quotes_if_needed(js_link)
@@ -380,11 +392,11 @@ def add_js_link(driver, js_link):
 
 def add_css_style(driver, css_style):
     add_css_style_script = """function injectStyle(css) {
-          var head = document.getElementsByTagName("head")[0];
-          var style = document.createElement("style");
-          style.type = "text/css";
-          style.appendChild(document.createTextNode(css));
-          head.appendChild(style);
+          var head_tag=document.getElementsByTagName("head")[0];
+          var style_tag=document.createElement("style");
+          style_tag.type="text/css";
+          style_tag.appendChild(document.createTextNode(css));
+          head_tag.appendChild(style_tag);
        }
        injectStyle("%s");"""
     css_style = css_style.replace("\n", "")
@@ -397,12 +409,12 @@ def add_js_code_from_link(driver, js_link):
         js_link = "http:" + js_link
     js_code = requests.get(js_link).text
     add_js_code_script = (
-        """var body = document.getElementsByTagName('body').item(0);"""
-        """var script = document.createElement("script");"""
-        """script.type = "text/javascript";"""
-        """script.onload = function() { null };"""
-        """script.appendChild(document.createTextNode("%s"));"""
-        """body.appendChild(script);"""
+        """var body_tag=document.getElementsByTagName('body').item(0);"""
+        """var script_tag=document.createElement("script");"""
+        """script_tag.type="text/javascript";"""
+        """script_tag.onload=function() { null };"""
+        """script_tag.appendChild(document.createTextNode("%s"));"""
+        """body_tag.appendChild(script_tag);"""
     )
     js_code = js_code.replace("\n", " ")
     js_code = escape_quotes_if_needed(js_code)
@@ -411,12 +423,12 @@ def add_js_code_from_link(driver, js_link):
 
 def add_js_code(driver, js_code):
     add_js_code_script = (
-        """var body = document.getElementsByTagName('body').item(0);"""
-        """var script = document.createElement("script");"""
-        """script.type = "text/javascript";"""
-        """script.onload = function() { null };"""
-        """script.appendChild(document.createTextNode("%s"));"""
-        """body.appendChild(script);"""
+        """var body_tag=document.getElementsByTagName('body').item(0);"""
+        """var script_tag=document.createElement("script");"""
+        """script_tag.type="text/javascript";"""
+        """script_tag.onload=function() { null };"""
+        """script_tag.appendChild(document.createTextNode("%s"));"""
+        """body_tag.appendChild(script_tag);"""
     )
     js_code = js_code.replace("\n", " ")
     js_code = escape_quotes_if_needed(js_code)
@@ -432,10 +444,10 @@ def add_meta_tag(driver, http_equiv=None, content=None):
             "script-src: 'self' 'unsafe-inline' 'unsafe-eval'"
         )
     script_to_add_meta = """function injectMeta() {
-           var meta = document.createElement('meta');
-           meta.httpEquiv = "%s";
-           meta.content = "%s";
-           document.getElementsByTagName('head')[0].appendChild(meta);
+           var meta_tag=document.createElement('meta');
+           meta_tag.httpEquiv="%s";
+           meta_tag.content="%s";
+           document.getElementsByTagName('head')[0].appendChild(meta_tag);
         }
         injectMeta();""" % (
         http_equiv,
diff --git a/seleniumbase/translate/master_dict.py b/seleniumbase/translate/master_dict.py
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class GoogleTests(BaseCase):`
`6`	`6`	`@parameterized.expand(`
`7`	`7`	`[`
`8`	`8`	`["PyPI", "pypi.org", 'img[alt="PyPI"]'],`
`9`		`- ["Wikipedia", "wikipedia.org", "img.central-featured-logo"],`
	`9`	`+ ["Wikipedia", "www.wikipedia.org", "img.central-featured-logo"],`
`10`	`10`	`["SeleniumBase", "seleniumbase/SeleniumBase", 'img[title*="Sel"]'],`
`11`	`11`	`]`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# seleniumbase package`
`2`		`-__version__ = "1.63.14"`
	`2`	`+__version__ = "1.63.15"`