Merge pull request #1780 from seleniumbase/refactoring-and-dependencies

mdmintz · web-flow · commit 933bae904a5e · 2023-03-04T01:36:06.000-05:00
Refactoring / Dependencies
diff --git a/examples/boilerplates/samples/google_test.py b/examples/boilerplates/samples/google_test.py
@@ -7,8 +7,8 @@ class GoogleTests(BaseCase):
     def test_google_dot_com(self):
         self.open("https://google.com/ncr")
         self.sleep(0.5)
-        self.hide_elements('iframe[name="callout"]')
         self.save_screenshot_to_logs()  # ("./latest_logs" folder)
+        self.sleep(0.5)
         self.type(HomePage.search_box, "github.com")
         self.assert_element(HomePage.search_button)
         self.assert_element(HomePage.feeling_lucky_button)
diff --git a/examples/boilerplates/samples/test_page_objects.py b/examples/boilerplates/samples/test_page_objects.py
@@ -6,9 +6,12 @@
 class GooglePage:
     def go_to_google(self, sb):
         sb.open("https://google.com/ncr")
-        sb.remove_elements("iframe")
+        sb.sleep(0.2)
+        sb.hide_elements('iframe[name="callout"]')  # Hide "Sign in" pop-up
+        sb.sleep(0.1)
 
     def do_search(self, sb, search_term):
+        sb.click('input[title="Search"]')
         sb.type('input[title="Search"]', search_term + "\n")
 
     def click_search_result(self, sb, content):
diff --git a/examples/chart_maker/test_area_chart.py b/examples/chart_maker/test_area_chart.py
@@ -16,4 +16,4 @@ def test_area_chart(self):
         self.add_data_point("Fri", 65)
         self.add_data_point("Sat", 50)
         self.add_slide("<p><b>Area Chart</b></p>" + self.extract_chart())
-        self.begin_presentation(filename="line_chart.html", interval=8)
+        self.begin_presentation(filename="line_chart.html", interval=4)
diff --git a/examples/chart_maker/test_line_chart.py b/examples/chart_maker/test_line_chart.py
@@ -16,4 +16,4 @@ def test_line_chart(self):
         self.add_data_point("Fri", 65)
         self.add_data_point("Sat", 50)
         self.add_slide("<p>Line Chart</p>" + self.extract_chart())
-        self.begin_presentation(filename="line_chart.html", interval=8)
+        self.begin_presentation(filename="line_chart.html", interval=4)
diff --git a/examples/chart_maker/test_multi_series.py b/examples/chart_maker/test_multi_series.py
@@ -45,4 +45,4 @@ def test_multi_series(self):
         self.add_data_point("Sat", 31)
 
         self.add_slide("<p>Multi-Series Line Chart</p>" + self.extract_chart())
-        self.begin_presentation(filename="multi_series_chart.html", interval=8)
+        self.begin_presentation(filename="multi_series_chart.html", interval=4)
diff --git a/examples/edge_test.py b/examples/edge_test.py
@@ -9,12 +9,12 @@
 class EdgeTests(BaseCase):
     def test_edge(self):
         if self.browser != "edge":
-            self.open("about:blank")
+            self.open_if_not_url("about:blank")
             print("\n  This test is only for Microsoft Edge (Chromium)!")
             print('  (Run this test using "--edge" or "--browser=edge")')
             self.skip('Use "--edge" or "--browser=edge"')
-        if self.headless:
-            self.open("about:blank")
+        elif self.headless:
+            self.open_if_not_url("about:blank")
             print("\n  This test is NOT designed for Headless Mode!")
             self.skip('Do NOT use "--headless" with this test!')
         self.open("edge://settings/help")
diff --git a/examples/github_test.py b/examples/github_test.py
@@ -5,7 +5,7 @@
 class GitHubTests(BaseCase):
     def test_github(self):
         if self.headless or self.page_load_strategy == "none":
-            self.open_if_not_url("data:,")
+            self.open_if_not_url("about:blank")
             message = "Unsupported mode for this test."
             print("\n  " + message)
             self.skip(message)
diff --git a/examples/handle_alert_test.py b/examples/handle_alert_test.py
@@ -15,3 +15,6 @@ def test_alerts(self):
         self.assert_equal(alert.text, "My Prompt")  # Not input field
         self.dismiss_alert()
         self.sleep(1)  # Not needed (Lets you see the alert go away)
+        if self.browser == "safari" and self._reuse_session:
+            # Alerts can freeze Safari if reusing the browser session
+            self.driver.quit()
diff --git a/examples/offline_examples/test_handle_alerts.py b/examples/offline_examples/test_handle_alerts.py
@@ -17,3 +17,6 @@ def test_alerts(self):
         self.assert_equal(alert.text, "My Prompt")  # Not input field
         self.dismiss_alert()
         self.sleep(1)  # Not needed (Lets you see the alert go away)
+        if self.browser == "safari" and self._reuse_session:
+            # Alerts can freeze Safari if reusing the browser session
+            self.driver.quit()
diff --git a/examples/proxy_test.py b/examples/proxy_test.py
@@ -6,13 +6,17 @@
 class ProxyTests(BaseCase):
     def test_proxy(self):
         if self.headless:
-            self.open("about:blank")
+            self.open_if_not_url("about:blank")
             print("Skipping test in Headless Mode.")
             self.skip("Skipping test in Headless Mode.")
-        if self.recorder_mode:
-            self.open("about:blank")
+        elif self.recorder_mode:
+            self.open_if_not_url("about:blank")
             print("Skipping test in Recorder Mode.")
             self.skip("Skipping test in Recorder Mode.")
+        elif self.browser == "safari":
+            self.open_if_not_url("about:blank")
+            print("Skipping test for using Safari.")
+            self.skip("Skipping test for using Safari.")
         settings.SKIP_JS_WAITS = True
         if not self.page_load_strategy == "none":
             # This page takes too long to load otherwise
diff --git a/examples/rate_limiting_test.py b/examples/rate_limiting_test.py
@@ -11,11 +11,11 @@ def print_item(self, item):
 
     def test_rate_limited_printing(self):
         if self._multithreaded:
-            self.open("data:,")
+            self.open_if_not_url("about:blank")
             print("Skipping test in multi-threaded mode.")
             self.skip("Skipping test in multi-threaded mode.")
         if self.recorder_mode:
-            self.open("data:,")
+            self.open_if_not_url("about:blank")
             print("Skipping test in Recorder Mode.")
             self.skip("Skipping test in Recorder Mode.")
         message = "Running rate-limited print() on the command line"
diff --git a/examples/shadow_root_test.py b/examples/shadow_root_test.py
@@ -7,9 +7,15 @@
 class ShadowRootTest(BaseCase):
     def test_shadow_root(self):
         if self.recorder_mode:
-            self.open("about:blank")
-            print("Skipping test in Recorder Mode.")
-            self.skip("Skipping test in Recorder Mode.")
+            self.open_if_not_url("about:blank")
+            message = "Skipping test in Recorder Mode."
+            print(message)
+            self.skip(message)
+        elif self.browser == "safari":
+            self.open_if_not_url("about:blank")
+            message = "Skipping test for using Safari."
+            print(message)
+            self.skip(message)
         self.open("https://seleniumbase.io/other/shadow_dom")
         print("")
         self.click("button.tab_1")
diff --git a/examples/test_apple_site.py b/examples/test_apple_site.py
@@ -10,15 +10,15 @@ def test_apple_developer_site_webdriver_instructions(self):
             self.message_duration = 2.0
         if self.headless:
             if self._multithreaded:
-                self.open("about:blank")
+                self.open_if_not_url("about:blank")
                 print("Skipping test in headless multi-threaded mode.")
                 self.skip("Skipping test in headless multi-threaded mode.")
             elif self.undetectable:
-                self.open("about:blank")
+                self.open_if_not_url("about:blank")
                 print("Skipping test in headless undetectable mode.")
                 self.skip("Skipping test in headless undetectable mode.")
             elif self.recorder_mode:
-                self.open("about:blank")
+                self.open_if_not_url("about:blank")
                 print("Skipping test in headless Recorder Mode.")
                 self.skip("Skipping test in headless Recorder Mode.")
             elif self.browser == "chrome" or self.browser == "edge":
diff --git a/examples/test_canvas.py b/examples/test_canvas.py
@@ -29,10 +29,15 @@ def test_canvas_click_from_center(self):
         self.assert_equal(alert.text, "You clicked on the square!")
         self.accept_alert()
         self.sleep(0.55)  # Not needed (Lets you see the alert go away)
+        if self.browser == "safari" and self._reuse_session:
+            # Alerts can freeze Safari if reusing the browser session
+            self.driver.quit()
 
     def test_click_with_offset(self):
         self.open("https://seleniumbase.io/canvas/")
         if self.undetectable:
+            self.open_if_not_url("about:blank")
+            print("Skip this test in undetectable mode.")
             self.skip("Skip this test in undetectable mode.")
         self.assert_title_contains("Canvas")
         self.highlight("canvas")
diff --git a/examples/test_hack_search.py b/examples/test_hack_search.py
@@ -3,20 +3,21 @@
     set_attribute() -> Modifies the attribute of the first matching element.
     set_attributes() -> Modifies the attribute of all matching elements. """
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class HackingTests(BaseCase):
     def test_hack_search(self):
         if self.headless:
-            self.open_if_not_url("data:,")
+            self.open_if_not_url("about:blank")
             print("\n  This test is not for Headless Mode.")
             self.skip('Do not use "--headless" with this test.')
         self.open("https://google.com/ncr")
-        self.hide_elements("iframe")
         self.assert_element('input[title="Search"]')
+        self.sleep(0.5)
         self.set_attribute('[action="/search"]', "action", "//bing.com/search")
         self.set_attributes('[value="Google Search"]', "value", "Bing Search")
-        self.type('input[title="Search"]', "SeleniumBase GitHub Docs Install")
+        self.type('input[title="Search"]', "GitHub SeleniumBase Docs Install")
         self.sleep(0.5)
         self.js_click('[value="Bing Search"]')
         self.highlight("h1.b_logo")
diff --git a/examples/test_multiple_drivers.py b/examples/test_multiple_drivers.py
@@ -4,6 +4,11 @@
 
 class MultipleDriversTest(BaseCase):
     def test_multiple_drivers(self):
+        if self.browser == "safari":
+            self.open_if_not_url("about:blank")
+            message = "Safari doesn't support multiple drivers."
+            print(message)
+            self.skip(message)
         self.open("data:text/html,<h1>Driver 1</h1>")
         driver2 = self.get_new_driver()
         self.open("data:text/html,<h1>Driver 2</h1>")
diff --git a/examples/test_skype_site.py b/examples/test_skype_site.py
@@ -15,7 +15,7 @@
 class SkypeTests(BaseCase):
     def test_skype_mobile_site(self):
         if not self.mobile_emulator:
-            self.open("data:,")
+            self.open_if_not_url("about:blank")
             print("\n  This test is only for mobile-device web browsers!")
             print('  (Use "--mobile" to run this test in Mobile Mode!)')
             self.skip('Use "--mobile" to run this test in Mobile Mode!')
diff --git a/examples/test_suite.py b/examples/test_suite.py
@@ -6,26 +6,26 @@
 
 class MyTestSuite(BaseCase):
     def test_1(self):
-        self.open("https://xkcd.com/1664/")
-        self.assert_text("Mycology", "div#ctitle", timeout=4)
+        self.open("https://xkcd.com/1722/")
+        self.assert_text("Debugging", "div#ctitle", timeout=4)
         for p in range(3):
             self.click('a[rel="next"]')
-        self.assert_text("Algorithms", "div#ctitle", timeout=4)
+        self.assert_text("Linear Regression", "div#ctitle", timeout=4)
 
     @pytest.mark.expected_failure
     def test_2(self):
         print("\n(This test should fail)")
-        self.open("https://xkcd.com/1675/")
-        raise Exception("FAKE EXCEPTION: This test fails on purpose.")
+        self.open("https://xkcd.com/1373/")
+        self.assert_text("FakeText", "div#ctitle", timeout=0.4)
 
     def test_3(self):
-        self.open("https://xkcd.com/1406/")
-        self.assert_text("Universal Converter Box", "div#ctitle", timeout=4)
+        self.open("https://xkcd.com/2224/")
+        self.assert_text("Software Updates", "div#ctitle", timeout=4)
         self.open("https://xkcd.com/608/")
-        self.assert_text("Form", "div#ctitle", timeout=4)
+        self.assert_exact_text("Form", "div#ctitle", timeout=4)
 
     @pytest.mark.expected_failure
     def test_4(self):
         print("\n(This test should fail)")
-        self.open("https://xkcd.com/1670/")
-        self.assert_element("FakeElement.DoesNotExist", timeout=0.5)
+        self.open("https://xkcd.com/2224/")
+        self.assert_element("FakeElement.DoesNotExist", timeout=0.4)
diff --git a/examples/time_limit_test.py b/examples/time_limit_test.py
@@ -10,9 +10,9 @@ def test_runtime_limit_decorator(self):
         """This test fails on purpose to show the runtime_limit() decorator
         for code blocks that run longer than the time limit specified."""
         print("\n(This test should fail)")
-        self.open("https://xkcd.com/1190")
-        with decorators.runtime_limit(0.5):
-            self.sleep(0.75)
+        self.open("https://xkcd.com/2511")
+        with decorators.runtime_limit(0.7):
+            self.sleep(0.95)
 
     @pytest.mark.expected_failure
     def test_set_time_limit_method(self):
@@ -22,7 +22,7 @@ def test_set_time_limit_method(self):
         which is after pytest starts it's own internal clock for tests.
         Usage: (inside tests) =>  self.set_time_limit(SECONDS)
         Usage: (command-line) =>  --time-limit=SECONDS"""
-        self.set_time_limit(2.5)  # Fail test if time exceeds 2.5 seconds
+        self.set_time_limit(2.2)  # Fail test if time exceeds 2.2 seconds
         print("\n(This test should fail)")
         self.open("https://xkcd.com/1658")
         self.sleep(3)
diff --git a/examples/wordle_test.py b/examples/wordle_test.py
@@ -51,6 +51,7 @@ def modify_word_list(self, word, letter_status):
 
     def test_wordle(self):
         if self.headless:
+            self.open_if_not_url("about:blank")
             self.skip("Skip this test in headless mode!")
         self.open("https://www.nytimes.com/games/wordle/index.html")
         self.click_if_visible('svg[data-testid="icon-close"]', timeout=2)
diff --git a/examples/youtube_search_test.py b/examples/youtube_search_test.py
@@ -6,10 +6,15 @@ class YouTubeSearchTests(BaseCase):
     def test_youtube_autocomplete_results(self):
         """Verify YouTube autocomplete search results."""
         if self.headless:
-            self.open_if_not_url("data:,")
+            self.open_if_not_url("about:blank")
             message = "This test is skipped in headless mode."
             print(message)
             self.skip(message)
+        elif self.browser == "safari":
+            self.open_if_not_url("about:blank")
+            message = "This test is skipped when using Safari."
+            print(message)
+            self.skip(message)
         self.open("https://www.youtube.com/c/MichaelMintz")
         search_term = "seleniumbase"
         search_selector = "input#search"
diff --git a/help_docs/happy_customers.md b/help_docs/happy_customers.md
@@ -1,8 +1,8 @@
 <!-- SeleniumBase Docs -->
 
-<h3 align="left"><img src="https://seleniumbase.github.io/cdn/img/sb_logo_b.png" alt="SeleniumBase" width="300" /></h3>
+<h3 align="left"><img src="https://seleniumbase.github.io/cdn/img/sb_logo_b.png" alt="SeleniumBase" width="320" /></h3>
 
-### Organizations who have used SeleniumBase:
+### Businesses who have used SeleniumBase:
 
 * [MIT](https://web.mit.edu/)
 * [Sony](https://www.sony.com/)
diff --git a/mkdocs_build/requirements.txt b/mkdocs_build/requirements.txt
@@ -15,7 +15,7 @@ ghp-import==2.1.0
 readme-renderer==37.3
 pymdown-extensions==9.9.2
 importlib-metadata==6.0.0
-pipdeptree==2.5.0
+pipdeptree==2.5.1
 bleach==6.0.0
 lunr==0.6.2
 nltk==3.8.1
@@ -27,7 +27,7 @@ cssselect2==0.7.0
 tinycss2==1.2.1
 defusedxml==0.7.1
 mkdocs==1.4.2
-mkdocs-material==9.0.15
+mkdocs-material==9.1.0
 mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1.1
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,8 @@ keyring>=23.4.1;python_version<"3.8"
 keyring>=23.13.1;python_version>="3.8"
 tomli>=1.2.3;python_version<"3.7"
 tomli>=2.0.1;python_version>="3.7"
-tqdm>=4.64.1
+tqdm>=4.64.1;python_version<"3.7"
+tqdm>=4.65.0;python_version>="3.7"
 wheel>=0.37.1;python_version<"3.7"
 wheel>=0.38.4;python_version>="3.7"
 attrs==22.1.0;python_version<"3.7"
@@ -18,7 +19,7 @@ certifi>=2022.12.7
 filelock>=3.4.1;python_version<"3.7"
 filelock>=3.9.0;python_version>="3.7"
 platformdirs>=2.4.0;python_version<"3.7"
-platformdirs>=3.0.0;python_version>="3.7"
+platformdirs>=3.1.0;python_version>="3.7"
 pyparsing>=3.0.7;python_version<"3.7"
 zipp==3.6.0;python_version<"3.7"
 zipp>=3.15.0;python_version>="3.7"
@@ -35,7 +36,7 @@ urllib3==1.26.14;python_version>="3.7"
 requests==2.27.1;python_version<"3.7"
 requests==2.28.2;python_version>="3.7"
 requests-toolbelt==0.10.1
-pynose==1.4.1
+pynose==1.4.2
 sniffio==1.3.0;python_version>="3.7"
 h11==0.14.0;python_version>="3.7"
 outcome==1.2.0;python_version>="3.7"
@@ -58,7 +59,7 @@ iniconfig==2.0.0;python_version>="3.7"
 pluggy==1.0.0
 py==1.11.0
 pytest==7.0.1;python_version<"3.7"
-pytest==7.2.1;python_version>="3.7"
+pytest==7.2.2;python_version>="3.7"
 pytest-forked==1.4.0;python_version<"3.7"
 pytest-forked==1.6.0;python_version>="3.7"
 pytest-html==2.0.1
@@ -76,7 +77,7 @@ soupsieve==2.3.2.post1;python_version<"3.7"
 soupsieve==2.4;python_version>="3.7"
 beautifulsoup4==4.11.2
 cryptography==36.0.2;python_version<"3.7"
-cryptography==39.0.1;python_version>="3.7"
+cryptography==39.0.2;python_version>="3.7"
 pygments==2.14.0
 pyreadline3==3.4.1;platform_system=="Windows"
 tabcompleter==1.1.0
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.13.5"
+__version__ = "4.13.6"
diff --git a/seleniumbase/behave/behave_sb.py b/seleniumbase/behave/behave_sb.py
@@ -823,6 +823,10 @@ def get_configured_sb(context):
         sb.headless2 = True
     if not sb.headless and not sb.headless2:
         sb.headed = True
+    if sb.browser == "safari" and sb.headless:
+        sb.headless = False  # Safari doesn't support headless mode
+    if sb.save_screenshot_after_test and sb.no_screenshot_after_test:
+        sb.save_screenshot_after_test = False  # "no_screenshot" has priority
     if sb.servername != "localhost":
         # Using Selenium Grid
         # (Set -D server="127.0.0.1" for localhost Grid)
diff --git a/seleniumbase/config/ad_block_list.py b/seleniumbase/config/ad_block_list.py
diff --git a/seleniumbase/console_scripts/sb_install.py b/seleniumbase/console_scripts/sb_install.py
diff --git a/seleniumbase/console_scripts/sb_mkdir.py b/seleniumbase/console_scripts/sb_mkdir.py
diff --git a/seleniumbase/core/browser_launcher.py b/seleniumbase/core/browser_launcher.py
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
diff --git a/seleniumbase/plugins/base_plugin.py b/seleniumbase/plugins/base_plugin.py
diff --git a/seleniumbase/plugins/db_reporting_plugin.py b/seleniumbase/plugins/db_reporting_plugin.py
diff --git a/seleniumbase/plugins/pytest_plugin.py b/seleniumbase/plugins/pytest_plugin.py
diff --git a/seleniumbase/plugins/sb_manager.py b/seleniumbase/plugins/sb_manager.py
diff --git a/seleniumbase/plugins/selenium_plugin.py b/seleniumbase/plugins/selenium_plugin.py
diff --git a/setup.py b/setup.py
