Merge pull request #836 from seleniumbase/update-tours-and-dependencies

mdmintz · web-flow · commit e04d6d875b02 · 2021-03-06T23:58:08.000-05:00
Update options, tours, dependencies, and more
diff --git a/README.md b/README.md
@@ -358,6 +358,7 @@ The code above will leave your browser window open in case there's a failure. (i
 --headless  # (Run tests headlessly. Default mode on Linux OS.)
 --headed  # (Run tests with a GUI on Linux OS.)
 --locale=LOCALE_CODE  # (Set the Language Locale Code for the web browser.)
+--interval=SECONDS  # (The autoplay interval for presentations & tour steps)
 --start-page=URL  # (The starting URL for the web browser when tests begin.)
 --archive-logs  #  (Archive existing log files instead of deleting them.)
 --archive-downloads  #  (Archive old downloads instead of deleting them.)
diff --git a/examples/edge_test.py b/examples/edge_test.py
@@ -4,13 +4,13 @@
 from seleniumbase import BaseCase
 
 
-class EdgeTestClass(BaseCase):
+class EdgeTests(BaseCase):
 
     def test_edge(self):
         if self.browser != "edge":
             print("\n  This test is only for Microsoft Edge (Chromium)!")
-            print("  (Run with: '--browser=edge')")
-            self.skip("This test is only for Microsoft Edge (Chromium)!")
+            print('  (Run this test using "--edge" or "--browser=edge")')
+            self.skip('Use "--edge" or "--browser=edge"')
         self.open("edge://settings/help")
         self.assert_element('img[alt="Edge logo"] + span')
         self.highlight('#section_about div + div')
diff --git a/examples/example_logs/ReadMe.md b/examples/example_logs/ReadMe.md
@@ -1,7 +1,7 @@
 <h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Logging, Dashboards, and Reports:</h3>
 
 [<img src="http://img.youtube.com/vi/XpuJCjJhJwQ/0.jpg" title="SeleniumBase Features" width="285">](https://www.youtube.com/watch?v=XpuJCjJhJwQ)
-<p>(<b><a href="https://www.youtube.com/watch?v=XpuJCjJhJwQ">SB Dashboard Tutorial on YouTube</a></b>)</p>
+<p>(<b><a href="https://www.youtube.com/watch?v=XpuJCjJhJwQ">SBase Dashboard Tutorial on YouTube</a></b>)</p>
 
 🔵 During test failures, logs and screenshots from the most recent test run will get saved to the ``latest_logs/`` folder. If ``--archive-logs`` is specified (or if ARCHIVE_EXISTING_LOGS is set to True in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py)), test logs will also get archived to the ``archived_logs/`` folder. Otherwise, the log files will be cleaned out when the next test run begins (by default).
 
diff --git a/examples/raw_parameter_script.py b/examples/raw_parameter_script.py
@@ -81,6 +81,7 @@
     sb.ad_block_on = False
     sb.highlights = None
     sb.check_js = False
+    sb.interval = None
     sb.cap_file = None
     sb.cap_string = None
 
diff --git a/examples/swag_labs_suite.py b/examples/swag_labs_suite.py
@@ -28,6 +28,8 @@ def test_swag_labs_basic_flow(self, username):
         """ This test checks functional flow of the Swag Labs store.
             This test is parameterized on the login user. """
         self.login_to_swag_labs(username=username)
+        if username == "problem_user":
+            print("\n(This test should fail)")
 
         # Verify that the "Test.allTheThings() T-Shirt" appears on the page
         item_name = "Test.allTheThings() T-Shirt"
@@ -91,6 +93,8 @@ def test_swag_labs_products_page_links(self, username):
         """ This test checks for 404s on the Swag Labs products page.
             This test is parameterized on the login user. """
         self.login_to_swag_labs(username=username, v1=True)
+        if username == "problem_user":
+            print("\n(This test should fail)")
         self.assert_no_404_errors()
 
     @parameterized.expand([
@@ -102,6 +106,8 @@ def test_swag_labs_visual_regressions(self, username):
         """ This test checks for visual regressions on the Swag Labs page.
             This test is parameterized on the login user. """
         self.login_to_swag_labs(username="standard_user")
+        if username == "problem_user":
+            print("\n(This test should fail)")
         self.check_window(baseline=True)
         self.login_to_swag_labs(username=username)
         self.check_window(level=3)
diff --git a/examples/test_deferred_asserts.py b/examples/test_deferred_asserts.py
@@ -13,7 +13,7 @@ class MyTestClass(BaseCase):
     def test_deferred_asserts(self):
         self.open('https://xkcd.com/993/')
         self.wait_for_element('#comic')
-        print("\n(This test fails on purpose)")
+        print("\n(This test should fail)")
         self.deferred_assert_element('img[alt="Brand Identity"]')
         self.deferred_assert_element('img[alt="Rocket Ship"]')  # Will Fail
         self.deferred_assert_element('#comicmap')
diff --git a/examples/test_fail.py b/examples/test_fail.py
@@ -13,5 +13,5 @@ class MyTestClass(BaseCase):
     @pytest.mark.expected_failure
     def test_find_army_of_robots_on_xkcd_desert_island(self):
         self.open("https://xkcd.com/731/")
-        print("\n(This test fails on purpose)")
+        print("\n(This test should fail)")
         self.assert_element("div#ARMY_OF_ROBOTS", timeout=1)
diff --git a/examples/test_skype_site.py b/examples/test_skype_site.py
@@ -9,13 +9,13 @@
 from seleniumbase import BaseCase
 
 
-class SkypeWebsiteTestClass(BaseCase):
+class SkypeTests(BaseCase):
 
-    def test_skype_website_on_mobile(self):
+    def test_skype_mobile_site(self):
         if not self.mobile_emulator:
-            print("\n  This test is only for mobile devices / emulators!")
-            print("  (Usage: '--mobile' with a Chromium-based browser.)")
-            self.skip("Please rerun this test using '--mobile' !!!")
+            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!')
         self.open("https://www.skype.com/en/")
         self.assert_text("Install Skype", "div.appInfo")
         self.highlight("div.appBannerContent")
diff --git a/examples/test_suite.py b/examples/test_suite.py
@@ -15,7 +15,7 @@ def test_1(self):
 
     @pytest.mark.expected_failure
     def test_2(self):
-        print("\n(This test fails on purpose)")
+        print("\n(This test should fail)")
         self.open("https://xkcd.com/1675/")
         raise Exception("FAKE EXCEPTION: This test fails on purpose.")
 
@@ -27,6 +27,6 @@ def test_3(self):
 
     @pytest.mark.expected_failure
     def test_4(self):
-        print("\n(This test fails on purpose)")
+        print("\n(This test should fail)")
         self.open("https://xkcd.com/1670/")
         self.assert_element("FakeElement.DoesNotExist", timeout=0.5)
diff --git a/examples/timeout_test.py b/examples/timeout_test.py
@@ -15,5 +15,5 @@ class MyTestClass(BaseCase):
     def test_time_limit_feature(self):
         self.set_time_limit(5)  # Fail test if time exceeds 5 seconds
         self.open("https://xkcd.com/1658/")
-        print("\n(This test fails on purpose)")
+        print("\n(This test should fail)")
         self.sleep(7)
diff --git a/examples/tour_examples/bootstrap_google_tour.py b/examples/tour_examples/bootstrap_google_tour.py
@@ -21,14 +21,15 @@ def test_google_tour(self):
         self.play_tour()
 
         self.highlight_update_text('input[title="Search"]', "GitHub\n")
+        self.ad_block()
         self.wait_for_element("#search")
 
         self.create_bootstrap_tour()
-        self.add_tour_step("See Results Here!", title="(5-second autoplay)")
+        self.add_tour_step("3-second autoplay...")
         self.add_tour_step("Here's the next tour:")
-        self.play_tour(interval=5)  # Tour automatically continues after 5 sec
+        self.play_tour(interval=3)  # Tour automatically continues after 3 sec
 
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput", timeout=20)
         self.wait_for_element("#minimap", timeout=20)
         self.wait_for_element("#zoom", timeout=20)
diff --git a/examples/tour_examples/bootstrap_xkcd_tour.py b/examples/tour_examples/bootstrap_xkcd_tour.py
@@ -14,7 +14,6 @@ def test_bootstrap_tour(self):
         self.add_tour_step("Click here for the next comic.", 'a[rel="next"]')
         self.add_tour_step("Click here for the previous one.", 'a[rel="prev"]')
         self.add_tour_step("Learn about the author here.", 'a[rel="author"]')
-        self.add_tour_step("Click here for the license.", 'a[rel="license"]')
         self.add_tour_step("Click for a random comic.", 'a[href*="/random/"]')
         self.add_tour_step("Thanks for taking this tour!")
         self.export_tour(filename="bootstrap_xkcd_tour.js")  # Exports the tour
diff --git a/examples/tour_examples/driverjs_maps_tour.py b/examples/tour_examples/driverjs_maps_tour.py
@@ -4,7 +4,7 @@
 class MyTestClass(BaseCase):
 
     def test_create_tour(self):
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput", timeout=20)
         self.wait_for_element("#minimap", timeout=20)
         self.wait_for_element("#zoom", timeout=20)
diff --git a/examples/tour_examples/google_tour.py b/examples/tour_examples/google_tour.py
@@ -25,16 +25,17 @@ def test_google_tour(self):
         self.play_tour()
 
         self.highlight_update_text('input[title="Search"]', "GitHub\n")
+        self.ad_block()
         self.wait_for_element("#search")
 
         # Create a website tour using the Bootstrap Tour JS library
         # Same as:  self.create_bootstrap_tour()
         self.create_tour(theme="bootstrap")
-        self.add_tour_step("See Results Here!", title="(5-second autoplay)")
+        self.add_tour_step("3-second autoplay...")
         self.add_tour_step("Here's the next tour:")
-        self.play_tour(interval=5)  # Tour automatically continues after 5 sec
+        self.play_tour(interval=3)  # Tour automatically continues after 3 sec
 
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput")
         self.wait_for_element("#minimap")
         self.wait_for_element("#zoom")
diff --git a/examples/tour_examples/hopscotch_google_tour.py b/examples/tour_examples/hopscotch_google_tour.py
@@ -21,14 +21,15 @@ def test_google_tour(self):
         self.play_tour()
 
         self.highlight_update_text('input[title="Search"]', "GitHub\n")
+        self.ad_block()
         self.wait_for_element("#search")
 
         self.create_hopscotch_tour()
-        self.add_tour_step("See Results Here!", title="(5-second autoplay)")
+        self.add_tour_step("3-second autoplay...")
         self.add_tour_step("Here's the next tour:")
-        self.play_tour(interval=5)  # Tour automatically continues after 5 sec
+        self.play_tour(interval=3)  # Tour automatically continues after 3 sec
 
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput", timeout=20)
         self.wait_for_element("#minimap", timeout=20)
         self.wait_for_element("#zoom", timeout=20)
diff --git a/examples/tour_examples/introjs_google_tour.py b/examples/tour_examples/introjs_google_tour.py
@@ -21,14 +21,15 @@ def test_google_tour(self):
         self.play_tour()
 
         self.highlight_update_text('input[title="Search"]', "GitHub\n")
+        self.ad_block()
         self.wait_for_element("#search")
 
         self.create_introjs_tour()
-        self.add_tour_step("See Results Here!", title="(5-second autoplay)")
+        self.add_tour_step("3-second autoplay...")
         self.add_tour_step("Here's the next tour:")
-        self.play_tour(interval=5)  # Tour automatically continues after 5 sec
+        self.play_tour(interval=3)  # Tour automatically continues after 3 sec
 
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput", timeout=20)
         self.wait_for_element("#minimap", timeout=20)
         self.wait_for_element("#zoom", timeout=20)
diff --git a/examples/tour_examples/maps_introjs_tour.py b/examples/tour_examples/maps_introjs_tour.py
@@ -4,7 +4,7 @@
 class MyTourClass(BaseCase):
 
     def test_google_maps_tour(self):
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput", timeout=20)
         self.wait_for_element("#minimap", timeout=20)
         self.wait_for_element("#zoom", timeout=20)
diff --git a/examples/tour_examples/shepherd_google_tour.py b/examples/tour_examples/shepherd_google_tour.py
@@ -21,14 +21,15 @@ def test_google_tour(self):
         self.play_tour()
 
         self.highlight_update_text('input[title="Search"]', "GitHub\n")
+        self.ad_block()
         self.wait_for_element("#search")
 
         self.create_shepherd_tour(theme="square-dark")
-        self.add_tour_step("See Results Here!", title="(5-second autoplay)")
+        self.add_tour_step("3-second autoplay...")
         self.add_tour_step("Here's the next tour:")
-        self.play_tour(interval=5)  # Tour automatically continues after 5 sec
+        self.play_tour(interval=3)  # Tour automatically continues after 3 sec
 
-        self.open("https://www.google.com/maps/@42.3598616,-71.0912631,15z")
+        self.open("https://www.google.com/maps/@42.3591234,-71.0915634,15z")
         self.wait_for_element("#searchboxinput", timeout=20)
         self.wait_for_element("#minimap", timeout=20)
         self.wait_for_element("#zoom", timeout=20)
diff --git a/examples/visual_testing/test_layout_fail.py b/examples/visual_testing/test_layout_fail.py
@@ -11,6 +11,7 @@ def test_applitools_change(self):
         self.click('a[href="?diff1"]')
         # Click a button that makes a hidden element visible
         self.click("button")
+        print("(This test should fail)")
         self.check_window(name="helloworld", level=3)
 
     def test_python_home_change(self):
@@ -19,6 +20,7 @@ def test_python_home_change(self):
         self.check_window(name="python_home", baseline=True)
         # Remove the "Donate" button
         self.remove_element('a.donate-button')
+        print("(This test should fail)")
         self.check_window(name="python_home", level=3)
 
     def test_xkcd_logo_change(self):
@@ -28,4 +30,5 @@ def test_xkcd_logo_change(self):
         # Change height: (83 -> 110) , Change width: (185 -> 120)
         self.set_attribute('[alt="xkcd.com logo"]', "height", "110")
         self.set_attribute('[alt="xkcd.com logo"]', "width", "120")
+        print("(This test should fail)")
         self.check_window(name="xkcd_554", level=3)
diff --git a/help_docs/customizing_test_runs.md b/help_docs/customizing_test_runs.md
@@ -116,6 +116,7 @@ SeleniumBase provides additional ``pytest`` command-line options for tests:
 --headless  # (Run tests headlessly. Default mode on Linux OS.)
 --headed  # (Run tests with a GUI on Linux OS.)
 --locale=LOCALE_CODE  # (Set the Language Locale Code for the web browser.)
+--interval=SECONDS  # (The autoplay interval for presentations & tour steps)
 --start-page=URL  # (The starting URL for the web browser when tests begin.)
 --archive-logs  #  (Archive existing log files instead of deleting them.)
 --archive-downloads  #  (Archive old downloads instead of deleting them.)
diff --git a/help_docs/features_list.md b/help_docs/features_list.md
@@ -1,7 +1,7 @@
 [<img src="https://seleniumbase.io/cdn/img/super_logo_sb.png" title="SeleniumBase" width="285">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 [<img src="http://img.youtube.com/vi/Sjzq9kU5kOw/0.jpg" title="SeleniumBase Features" width="285">](https://www.youtube.com/watch?v=Sjzq9kU5kOw)
-<p>(<b><a href="https://www.youtube.com/watch?v=Sjzq9kU5kOw">Watch the SB tutorial on YouTube!</a></b>)</p>
+<p>(<b><a href="https://www.youtube.com/watch?v=Sjzq9kU5kOw">Watch the SBase tutorial on YouTube</a></b>)</p>
 
 <a id="feature_list"></a>
 <h2><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> ⛲ Features: 🗂️</h2>
@@ -37,5 +37,7 @@
 * Can load and make assertions on PDF files from websites or the local file system.
 * Includes useful [Python decorators and password obfuscation methods](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/common/ReadMe.md).
 
+--------
+
 [<img src="http://img.youtube.com/vi/yEQeAU_mrg0/0.jpg" title="SeleniumBase Features" width="285">](https://www.youtube.com/watch?v=yEQeAU_mrg0)
-<p>(<b><a href="https://www.youtube.com/watch?v=yEQeAU_mrg0">See a quick overview on YouTube!</a></b>)</p>
+<p>(<b><a href="https://www.youtube.com/watch?v=yEQeAU_mrg0">See SB features in action on YouTube</a></b>)</p>
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ pip>=21.0.1;python_version>="3.6"
 packaging>=20.9
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
-setuptools>=54.1.0;python_version>="3.6"
+setuptools>=54.1.1;python_version>="3.6"
 setuptools-scm>=5.0.2
 wheel>=0.36.2
 attrs>=20.3.0
@@ -78,8 +78,8 @@ cffi==1.14.5
 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.1;python_version>="3.6"
-rich==9.12.4;python_version>="3.6" and python_version<"4.0"
+Pillow==8.1.2;python_version>="3.6"
+rich==9.13.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"
diff --git a/seleniumbase/__version__.py b/seleniumbase/__version__.py
@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.56.8"
+__version__ = "1.57.0"
diff --git a/seleniumbase/config/ad_block_list.py b/seleniumbase/config/ad_block_list.py
@@ -17,6 +17,7 @@
 """
 
 AD_BLOCK_LIST = [
+    '[aria-label="Ads"]',
     '[src*="/adservice."]',
     '[src*="doubleclick.net"]',
     '[src*="googletagservices.com"]',
diff --git a/seleniumbase/core/style_sheet.py b/seleniumbase/core/style_sheet.py
@@ -101,18 +101,11 @@
 bt_backdrop_style = (
     '''
     .tour-tour-element {
-        box-shadow: 0 0 0 99999px rgba(0, 0, 0, 0.20);
         pointer-events: none !important;
-        z-index: 9999;
     }
-
     :not(.tour-tour-element) .orphan.tour-tour {
-        box-shadow: 0 0 0 99999px rgba(0, 0, 0, 0.20);
-    }
-
-    .tour-tour {
-        pointer-events: auto;
-        z-index: 9999;
+        box-shadow: 0 0 0 88422px rgba(0, 0, 0, 0.42);
+        pointer-events: auto !important;
     }
     ''')
 
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
diff --git a/seleniumbase/fixtures/constants.py b/seleniumbase/fixtures/constants.py
diff --git a/seleniumbase/plugins/pytest_plugin.py b/seleniumbase/plugins/pytest_plugin.py
diff --git a/seleniumbase/plugins/selenium_plugin.py b/seleniumbase/plugins/selenium_plugin.py
diff --git a/seleniumbase/resources/bootstrap_tour/bootstrap-tour-standalone.min.css b/seleniumbase/resources/bootstrap_tour/bootstrap-tour-standalone.min.css
diff --git a/seleniumbase/resources/bootstrap_tour/bootstrap-tour-standalone.min.js b/seleniumbase/resources/bootstrap_tour/bootstrap-tour-standalone.min.js
diff --git a/setup.py b/setup.py
