Merge pull request #1708 from seleniumbase/mostly-uc-mode-improvements

Mostly UC Mode improvements

Author: mdmintz

examples/boilerplates/samples/google_test.py

@@ -1,13 +1,12 @@
 """google.com example test that uses page objects"""
-
 from seleniumbase import BaseCase
 from .google_objects import HomePage, ResultsPage
 
 
 class GoogleTests(BaseCase):
     def test_google_dot_com(self):
         self.open("https://google.com/ncr")
-        self.sleep(0.1)
+        self.sleep(0.5)
         self.hide_elements('iframe[name="callout"]')
         self.save_screenshot_to_logs()  # ("./latest_logs" folder)
         self.type(HomePage.search_box, "github.com")

examples/migration/protractor/example_test.py

@@ -1,4 +1,5 @@
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class AngularJSHomePageTests(BaseCase):

examples/migration/protractor/input_test.py

@@ -1,4 +1,5 @@
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class AngularMaterialInputTests(BaseCase):

examples/migration/protractor/mat_paginator_test.py

@@ -1,4 +1,5 @@
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class AngularMaterialPaginatorTests(BaseCase):

examples/parameterized_test.py

@@ -6,9 +6,9 @@
 class GoogleTests(BaseCase):
     @parameterized.expand(
         [
-            ["Download Python", "Download Python", "img.python-logo"],
-            ["Wikipedia", "www.wikipedia.org", "img.central-featured-logo"],
-            ["SeleniumBase.io Docs", "SeleniumBase", 'img[alt*="SeleniumB"]'],
+            ["site:Python.org Download", "Download Python", "img.python-logo"],
+            ["site:SeleniumBase.io", "SeleniumBase", 'img[alt*="SeleniumB"]'],
+            ["site:Wikipedia.org", "Wikipedia", "img.central-featured-logo"],
         ]
     )
     def test_parameterized_google_search(self, search_key, expected_text, img):

examples/rate_limiting_test.py

@@ -1,6 +1,5 @@
-""" This test demonstrates the use of the "rate_limited" decorator.
-    You can use this decorator on any method to rate-limit it. """
-
+"""This test demonstrates the use of the "rate_limited" decorator.
+You can use this decorator on any method to rate-limit it."""
 from seleniumbase import BaseCase
 from seleniumbase import decorators
 
@@ -11,6 +10,10 @@ def print_item(self, item):
         print(item)
 
     def test_rate_limited_printing(self):
+        if self._multithreaded:
+            self.open("data:,")
+            print("Skipping test in multi-threaded mode.")
+            self.skip("Skipping test in multi-threaded mode.")
         message = "Running rate-limited print() on the command line"
         self.open("data:text/html,<p>%s</p>" % message)
         print("\n%s:" % message)

examples/raw_file_call.py

@@ -1,12 +1,7 @@
 """Call a file with "python" instead of "pytest".
-To run, use: "python raw_file_call.py".
-On newer version of SeleniumBase, use:
-BaseCase.main(__name__, __file__)"""
+To run, use: "python raw_file_call.py"."""
 from seleniumbase import BaseCase
-
-if __name__ == "__main__":
-    from pytest import main
-    main([__file__, "-s"])
+BaseCase.main(__name__, __file__)
 
 
 class TinyMceTest(BaseCase):

examples/swag_labs_user_tests.py

@@ -1,5 +1,6 @@
 from parameterized import parameterized
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class SwagLabsTests(BaseCase):

examples/test_calculator.py

@@ -1,5 +1,6 @@
-"""Test the SeleniumBase Calculator App with SeleniumBase."""
+"""Test the SeleniumBase Calculator App"""
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class CalculatorTests(BaseCase):
@@ -13,8 +14,3 @@ def test_6_times_7_plus_12_equals_54(self):
         self.click('button[id="2"]')
         self.click("button#equal")
         self.assert_exact_text("54", "input#output")
-
-
-if __name__ == "__main__":
-    from pytest import main
-    main([__file__, "-s"])

examples/test_canvas.py

@@ -1,5 +1,6 @@
 """Use SeleniumBase methods to interact with "canvas" elements."""
 from seleniumbase import BaseCase
+BaseCase.main(__name__, __file__)
 
 
 class CanvasTests(BaseCase):