Merge pull request #826 from seleniumbase/improve-safari-and-more

Improve downloads, Safari automation, reliability, and more

Author: mdmintz

docs/requirements.txt

@@ -2,13 +2,13 @@ regex>=2020.11.13
 tqdm>=4.57.0
 livereload==2.6.3;python_version>="3.6"
 joblib==1.0.1;python_version>="3.6"
-Markdown==3.3.3
+Markdown==3.3.4
 Jinja2==2.11.3
 readme-renderer==29.0
 pymdown-extensions==8.1.1
 lunr==0.5.8
 mkdocs==1.1.2
-mkdocs-material==7.0.0
+mkdocs-material==7.0.1
 mkdocs-simple-hooks==0.1.2
 mkdocs-material-extensions==1.0.1
 mkdocs-minify-plugin==0.4.0

examples/handle_alert_test.py

@@ -4,8 +4,10 @@
 class MyTestClass(BaseCase):
 
     def test_alerts(self):
+        if self.browser == "safari":
+            self.skip("This test doesn't run on Safari! (alert issues)")
         self.open("about:blank")
-        self.execute_script('window.alert("ALERT!!!")')
+        self.execute_script('window.alert("ALERT!!!");')
         self.sleep(1)  # Not needed (Lets you see the alert pop up)
         self.accept_alert()
         self.sleep(1)  # Not needed (Lets you see the alert go away)

examples/offline_examples/handle_alert_test.py

@@ -6,8 +6,10 @@
 class OfflineTestClass(BaseCase):
 
     def test_alerts(self):
+        if self.browser == "safari":
+            self.skip("This test doesn't run on Safari! (alert issues)")
         self.open("data:,")
-        self.execute_script('window.alert("ALERT!!!")')
+        self.execute_script('window.alert("ALERT!!!");')
         self.sleep(1)  # Not needed (Lets you see the alert pop up)
         self.accept_alert()
         self.sleep(1)  # Not needed (Lets you see the alert go away)

examples/proxy_test.py

@@ -9,6 +9,12 @@ def test_proxy(self):
         ip_address = self.get_text("div.home-ip-details span.value")[1:-1]
         print("\n\nMy IP Address = %s\n" % ip_address)
         print("Displaying Host Info:")
-        print(self.get_text('div.home-ip-details').split('asn: ')[0])
+        text = self.get_text('div.home-ip-details').split('asn:')[0]
+        rows = text.split('\n')
+        data = []
+        for row in rows:
+            if row.strip() != "":
+                data.append(row.strip())
+        print("\n".join(data).replace('\n"', ' '))
         print("\nThe browser will close automatically in 7 seconds...")
         time.sleep(7)

examples/test_download_files.py

@@ -6,14 +6,24 @@ class DownloadTests(BaseCase):
 
     def test_download_files(self):
         self.open("https://pypi.org/project/seleniumbase/#files")
-        pkg_header = self.get_text("h1.package-header__name")
+        pkg_header = self.get_text("h1.package-header__name").strip()
         pkg_name = pkg_header.replace(" ", "-")
         whl_file = pkg_name + "-py2.py3-none-any.whl"
         tar_gz_file = pkg_name + ".tar.gz"
 
         # Click the links to download the files
-        self.click('div#files a[href$="%s"]' % whl_file)
-        self.click('div#files a[href$="%s"]' % tar_gz_file)
+        # (If using Safari, IE, or Chromium Guest Mode, download directly.)
+        whl_selector = 'div#files a[href$="%s"]' % whl_file
+        tar_selector = 'div#files a[href$="%s"]' % tar_gz_file
+        if self.browser == "safari" or self.browser == "ie" or (
+                self.is_chromium() and self.guest_mode and not self.headless):
+            whl_href = self.get_attribute(whl_selector, "href")
+            tar_href = self.get_attribute(tar_selector, "href")
+            self.download_file(whl_href)
+            self.download_file(tar_href)
+        else:
+            self.click(whl_selector)
+            self.click(tar_selector)
 
         # Verify that the downloaded files appear in the [Downloads Folder]
         # (This only guarantees that the exact file name is in the folder.)

examples/translations/chinese_test_1.py

@@ -5,18 +5,19 @@
 class 我的测试类(硒测试用例):
 
     def test_例子1(self):
-        self.开启网址("https://xkcd.in/comic?lg=cn&id=353")
-        self.断言标题("Python - XKCD中文站")
-        self.断言元素("#content div.comic-body")
-        self.断言文本("上漫画")
-        self.单击("div.nextLink")
-        self.断言文本("母亲的功绩", "#content h1")
-        self.单击链接文本("下一篇")
-        self.断言文本("敲打", "#content h1")
-        self.断言文本("有时，最有趣的事也会显得无聊")
-        self.回去()
-        self.单击链接文本("兰德尔·门罗")
-        self.断言文本("兰德尔·门罗", "#firstHeading")
-        self.输入文本("#searchInput", "程式设计")
+        self.开启("https://zh.wikipedia.org/wiki/")
+        self.断言标题("维基百科，自由的百科全书")
+        self.断言元素('a[title="首页"]')
+        self.断言文本("新闻动态", "span#新闻动态")
+        self.输入文本("#searchInput", "舞龍")
         self.单击("#searchButton")
-        self.断言文本("程序设计", "#firstHeading")
+        self.断言文本("舞龍", "#firstHeading")
+        self.断言元素('img[src*="Chinese_draak.jpg"]')
+        self.输入文本("#searchInput", "火鍋")
+        self.单击("#searchButton")
+        self.断言文本("火鍋", "#firstHeading")
+        self.断言元素('td:contains("火鍋的各種食材")')
+        self.输入文本("#searchInput", "精武英雄")
+        self.单击("#searchButton")
+        self.断言元素('img[src*="Fist_of_legend.jpg"]')
+        self.断言文本("李连杰", 'li a[title="李连杰"]')

examples/translations/english_test_1.py

@@ -8,7 +8,7 @@ def test_example_1(self):
         self.open(url)
         self.type("input.search-input", "xkcd book\n")
         self.assert_text("xkcd: volume 0", "h3")
-        self.click("li.checkout-link")
+        self.click("li.checkout-link a")
         self.assert_text("Shopping Cart", "#page-title")
         self.assert_element("div#umbrella")
         self.open("https://xkcd.com/353/")

help_docs/method_summary.md

@@ -300,11 +300,13 @@ self.save_data_as(data, file_name, destination_folder=None)
 
 self.get_downloads_folder()
 
-self.get_path_of_downloaded_file(file)
+self.get_browser_downloads_folder()
 
-self.is_downloaded_file_present(file)
+self.get_path_of_downloaded_file(file, browser=False)
 
-self.assert_downloaded_file(file, timeout=None)
+self.is_downloaded_file_present(file, browser=False)
+
+self.assert_downloaded_file(file, timeout=None, browser=False)
 
 self.assert_true(expr, msg=None)
 
@@ -322,6 +324,8 @@ self.assert_no_js_errors()
 
 self.inspect_html()
 
+self.is_chromium()
+
 self.get_google_auth_password(totp_key=None)
 
 self.convert_css_to_xpath(css)

requirements.txt

@@ -78,7 +78,7 @@ 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.1.0;python_version>="3.6"
-rich==9.11.1;python_version>="3.6" and python_version<"4.0"
+rich==9.12.0;python_version>="3.6" and python_version<"4.0"
 flake8==3.7.9;python_version<"3.5"
 flake8==3.8.4;python_version>="3.5"
 pyflakes==2.1.1;python_version<"3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.55.7"
+__version__ = "1.56.0"