Merge pull request #1704 from seleniumbase/refactoring-and-other-updates

Refactoring and other updates

Author: mdmintz

examples/coffee_cart_tests.py

@@ -1,4 +1,4 @@
-"""Use SeleniumBase to test a Coffee Cart App."""
+"""Use SeleniumBase to test the Coffee Cart App."""
 from seleniumbase import BaseCase
 BaseCase.main(__name__, __file__)
 

examples/edge_test.py

@@ -1,9 +1,10 @@
-"""
-This test is only for Microsoft Edge (Chromium)!
-(Tested on Edge Version 96.0.1054.62)
-"""
+"""This test is only for Microsoft Edge (Chromium)!"""
 from seleniumbase import BaseCase
 
+if __name__ == "__main__":
+    from pytest import main
+    main([__file__, "--edge", "-s"])
+
 
 class EdgeTests(BaseCase):
     def test_edge(self):
@@ -13,7 +14,7 @@ def test_edge(self):
             print('  (Run this test using "--edge" or "--browser=edge")')
             self.skip('Use "--edge" or "--browser=edge"')
         if self.headless:
-            self.open_if_not_url("about:blank")
+            self.open("data:,")
             print("\n  This test is NOT designed for Headless Mode!")
             self.skip('Do NOT use "--headless" with this test!')
         self.open("edge://settings/help")

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("about:blank")
+            self.open_if_not_url("data:,")
             message = "Unsupported mode for this test."
             print("\n  " + message)
             self.skip(message)

examples/old_wordle_script.py

@@ -1,14 +1,15 @@
-"""
-Solve the Wordle game using SeleniumBase.
-This test runs on archived versions of Wordle, containing Shadow-DOM.
-"""
-
+"""Solve the Wordle game using SeleniumBase.
+This test runs on archived versions of Wordle, containing Shadow-DOM."""
 import ast
 import random
 import requests
 from seleniumbase import version_tuple
 from seleniumbase import BaseCase
 
+if __name__ == "__main__":
+    from pytest import main
+    main([__file__, "--sjw", "--pls=none"])
+
 
 class WordleTests(BaseCase):
 

examples/parameterized_test.py

@@ -18,6 +18,3 @@ def test_parameterized_google_search(self, search_key, expected_text, img):
         self.assert_text(expected_text, "#search")
         self.click('a:contains("%s")' % expected_text)
         self.assert_element(img)
-        if "SeleniumBase" in search_key:
-            self.click('img[alt="SeleniumBase"]')
-            self.assert_element('img[title="SeleniumBase"]')

examples/setup.cfg

@@ -13,6 +13,3 @@ logging-level=INFO
 [behave]
 show_skipped=false
 show_timings=false
-
-[bdist_wheel]
-universal=1

examples/test_agent.py

@@ -9,18 +9,18 @@ def test_user_agent(self):
         original_user_agent = user_agent_detected
         if not self.user_agent:
             # Using the built-in user-agent string
-            self._print("\n\nUser-Agent: %s" % user_agent_detected)
+            print("\n\nUser-Agent: %s" % user_agent_detected)
         else:
             # User-agent was overridden using: --agent=STRING
-            self._print("\n\nUser-Agent override: %s" % user_agent_detected)
+            print("\n\nUser-Agent override: %s" % user_agent_detected)
         print("\n" + self.get_text(".ip-address p"))
         if not (self.headless or self.headless2 or self.xvfb):
             self.sleep(3)
 
         # Now change the user-agent using "execute_cdp_cmd()"
         if not self.is_chromium():
             msg = "\n* execute_cdp_cmd() is only for Chromium browsers"
-            self._print(msg)
+            print(msg)
             self.skip(msg)
         print("\n--------------------------")
         try:
@@ -35,7 +35,7 @@ def test_user_agent(self):
             )
             self.open("http://whatsmyuseragent.org/")
             user_agent_detected = self.get_text(".user-agent p")
-            self._print("\nUser-Agent override: %s" % user_agent_detected)
+            print("\nUser-Agent override: %s" % user_agent_detected)
             print("\n" + self.get_text(".ip-address p") + "\n")
             if not (self.headless or self.headless2 or self.xvfb):
                 self.sleep(3)

examples/test_apple_site.py

@@ -1,4 +1,5 @@
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class AppleTests(BaseCase):
@@ -9,9 +10,11 @@ def test_apple_developer_site_webdriver_instructions(self):
             self.message_duration = 2.0
         if self.headless:
             if self._multithreaded:
+                self.open("data:,")
                 print("Skipping test in headless multi-threaded mode.")
                 self.skip("Skipping test in headless multi-threaded mode.")
             elif self.undetectable:
+                self.open("data:,")
                 print("Skipping test in headless undetectable mode.")
                 self.skip("Skipping test in headless undetectable mode.")
             elif self.browser == "chrome" or self.browser == "edge":

examples/test_chinese_pdf.py

@@ -9,7 +9,7 @@ def test_chinese_pdf(self):
 
         # Get and print PDF text
         pdf_text = self.get_pdf_text(pdf, page=2)
-        self._print("\n" + pdf_text)
+        print("\n" + pdf_text)
 
         # Assert PDF contains the expected text on Page 2
         self.assert_pdf_text(pdf, "个测试类", page=2)

examples/test_demo_site.py

@@ -1,4 +1,5 @@
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class DemoSiteTests(BaseCase):
@@ -115,8 +116,3 @@ def test_demo_site(self):
         self.demo_mode = True
         self.type("input", "Have a Nice Day!")
         self.assert_text("SeleniumBase", "h2")
-
-
-if __name__ == "__main__":
-    from pytest import main
-    main([__file__, "-s"])