Merge pull request #1740 from seleniumbase/update-console-scripts-and-more

Update console scripts and more

Author: mdmintz

examples/coffee_cart_tests.py

@@ -12,6 +12,7 @@ def test_1_verify_nav_link_to_coffee_cart(self):
 
     def test_buy_one_cappuccino(self):
         self.open("https://seleniumbase.io/coffee/")
+        self.assert_title("Coffee Cart")
         self.click('div[data-test="Cappuccino"]')
         self.assert_exact_text("cart (1)", 'a[aria-label="Cart page"]')
         self.click('a[aria-label="Cart page"]')
@@ -50,6 +51,7 @@ def test_coffee_promo_with_preview(self):
 
     def test_context_click_add_coffee(self):
         self.open("https://seleniumbase.io/coffee/")
+        self.assert_title("Coffee Cart")
         self.context_click('div[data-test="Espresso_Macchiato"]')
         self.click('form button:contains("Yes")')
         self.assert_exact_text("cart (1)", 'a[aria-label="Cart page"]')

examples/offline_examples/user_agent_test.py

@@ -17,7 +17,7 @@ def test_get_user_agent(self):
             self.skip(msg)
         print("\n--------------------------")
         try:
-            self.driver.execute_cdp_cmd(
+            self.execute_cdp_cmd(
                 "Network.setUserAgentOverride",
                 {
                     "userAgent": "Mozilla/5.0 "
@@ -30,7 +30,7 @@ def test_get_user_agent(self):
             print('\nOverrided User Agent = "%s"' % new_user_agent)
         finally:
             # Reset the user-agent back to the original
-            self.driver.execute_cdp_cmd(
+            self.execute_cdp_cmd(
                 "Network.setUserAgentOverride",
                 {"userAgent": user_agent},
             )

examples/parameterized_test.py

@@ -3,18 +3,17 @@
 BaseCase.main(__name__, __file__)
 
 
-class GoogleTests(BaseCase):
+class SearchTests(BaseCase):
     @parameterized.expand(
         [
             ["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):
-        self.open("https://google.com/ncr")
-        self.remove_elements("iframe")
-        self.type('input[title="Search"]', search_key + "\n")
-        self.assert_text(expected_text, "#search")
+    def test_parameterized_search(self, search_key, expected_text, img):
+        self.open("https://duckduckgo.com/")
+        self.type('input[name="q"]', search_key + "\n")
+        self.assert_text(expected_text, "div.results")
         self.click('a:contains("%s")' % expected_text)
         self.assert_element(img)

examples/test_pytest_parametrize.py

@@ -3,14 +3,14 @@
 
 @pytest.mark.parametrize("value", ["pytest", "selenium"])
 def test_sb_fixture_with_no_class(sb, value):
-    sb.open("https://google.com/ncr")
-    sb.type('input[title="Search"]', value + "\n")
-    sb.assert_text(value, "div#center_col")
+    sb.open("https://duckduckgo.com/")
+    sb.type('input[name="q"]', value + "\n")
+    sb.assert_text(value, "div.results")
 
 
 class Test_SB_Fixture:
     @pytest.mark.parametrize("value", ["pytest", "selenium"])
     def test_sb_fixture_inside_class(self, sb, value):
-        sb.open("https://google.com/ncr")
-        sb.type('input[title="Search"]', value + "\n")
-        sb.assert_text(value, "div#center_col")
+        sb.open("https://duckduckgo.com/")
+        sb.type('input[name="q"]', value + "\n")
+        sb.assert_text(value, "div.results")

examples/user_agent_test.py

@@ -24,7 +24,7 @@ def test_user_agent(self):
             self.skip(msg)
         print("\n--------------------------")
         try:
-            self.driver.execute_cdp_cmd(
+            self.execute_cdp_cmd(
                 "Network.setUserAgentOverride",
                 {
                     "userAgent": "Mozilla/5.0 "
@@ -41,7 +41,7 @@ def test_user_agent(self):
                 self.sleep(3)
         finally:
             # Reset the user-agent back to the original
-            self.driver.execute_cdp_cmd(
+            self.execute_cdp_cmd(
                 "Network.setUserAgentOverride",
                 {"userAgent": original_user_agent},
             )

help_docs/method_summary.md

@@ -206,6 +206,8 @@ self.open_html_file(html_file)
 
 self.execute_script(script, *args, **kwargs)
 
+self.execute_cdp_cmd(script, *args, **kwargs)
+
 self.execute_async_script(script, timeout=None)
 
 self.safe_execute_script(script, *args, **kwargs)

requirements.txt

@@ -18,7 +18,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>=2.6.2;python_version>="3.7"
+platformdirs>=3.0.0;python_version>="3.7"
 pyparsing>=3.0.7;python_version<"3.7"
 zipp==3.6.0;python_version<"3.7"
 zipp>=3.12.1;python_version>="3.7"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.12.6"
+__version__ = "4.12.7"

seleniumbase/console_scripts/sb_install.py

@@ -676,7 +676,7 @@ def main(override=None, intel_for_uc=None):
         contents = zip_ref.namelist()
         if (
             len(contents) >= 1
-            and name in ["chromedriver", "uc_driver"]
+            and name in ["chromedriver", "uc_driver", "geckodriver"]
         ):
             for f_name in contents:
                 if (

seleniumbase/console_scripts/sb_mkdir.py

@@ -159,6 +159,7 @@ def main():
     data = []
     data.append("[flake8]")
     data.append("exclude=recordings,temp")
+    data.append("ignore=W503")
     data.append("")
     data.append("[nosetests]")
     data.append("nocapture=1")