Update example tests

Author: mdmintz

examples/raw_cdp_logging.py

@@ -4,7 +4,7 @@
 driver = Driver(uc=True, log_cdp=True)
 try:
     driver.uc_open_with_reconnect("https://seleniumbase.io/apps/turnstile")
-    driver.uc_switch_to_frame("iframe")
+    driver.switch_to_frame("iframe")
     driver.uc_click("span.mark")
     driver.sleep(3)
     pprint(driver.get_log("performance"))

examples/raw_form_turnstile.py

@@ -1,26 +1,7 @@
 from seleniumbase import SB
 
-
-def open_the_form_turnstile_page(sb):
-    sb.driver.uc_open_with_reconnect(
-        "https://seleniumbase.io/apps/form_turnstile", reconnect_time=2.7,
-    )
-
-
-def click_turnstile_and_verify(sb):
-    sb.scroll_to_bottom()
-    sb.driver.uc_switch_to_frame("iframe")
-    sb.driver.uc_click("span.mark")
-    sb.highlight("img#captcha-success", timeout=3.33)
-
-
 with SB(uc=True, test=True) as sb:
-    open_the_form_turnstile_page(sb)
-    try:
-        click_turnstile_and_verify(sb)
-    except Exception:
-        open_the_form_turnstile_page(sb)
-        click_turnstile_and_verify(sb)
+    sb.driver.uc_open_with_reconnect("seleniumbase.io/apps/form_turnstile", 3)
     sb.press_keys("#name", "SeleniumBase")
     sb.press_keys("#email", "[email protected]")
     sb.press_keys("#phone", "1-555-555-5555")
@@ -30,6 +11,9 @@ def click_turnstile_and_verify(sb):
     sb.click('span:contains("9:00 PM")')
     sb.highlight_click('input[value="AR"] + span')
     sb.click('input[value="cc"] + span')
+    sb.switch_to_frame("iframe")
+    sb.driver.uc_click("span.mark")
+    sb.highlight("img#captcha-success", timeout=3)
     sb.highlight_click('button:contains("Request & Pay")')
     sb.highlight("img#submit-success")
     sb.highlight('button:contains("Success!")')

examples/raw_nopecha.py

@@ -1,14 +1,14 @@
 from seleniumbase import SB
 
 with SB(uc=True, test=True) as sb:
-    sb.driver.uc_open_with_reconnect("https://nopecha.com/demo/turnstile", 4)
-    sb.driver.uc_switch_to_frame("#example-container5 iframe")
-    sb.driver.uc_click("span.mark", reconnect_time=1)
+    sb.driver.uc_open_with_reconnect("nopecha.com/demo/turnstile", 4.2)
+    sb.switch_to_frame("#example-container5 iframe")
+    sb.driver.uc_click("span.mark")
 
     if sb.is_element_visible("#example-container0 iframe"):
         sb.switch_to_frame("#example-container0 iframe")
         if not sb.is_element_visible("circle.success-circle"):
-            sb.driver.uc_click("span.mark", reconnect_time=1)
+            sb.driver.uc_click("span.mark")
             sb.switch_to_frame("#example-container0 iframe")
         sb.assert_element("circle.success-circle")
         sb.switch_to_parent_frame()

examples/raw_turnstile.py

@@ -3,14 +3,14 @@
 
 def open_the_turnstile_page(sb):
     sb.driver.uc_open_with_reconnect(
-        "https://seleniumbase.io/apps/turnstile", reconnect_time=2.7,
+        "seleniumbase.io/apps/turnstile", reconnect_time=3,
     )
 
 
 def click_turnstile_and_verify(sb):
-    sb.driver.uc_switch_to_frame("iframe")
+    sb.driver.switch_to_frame("iframe")
     sb.driver.uc_click("span.mark")
-    sb.assert_element("img#captcha-success", timeout=3.33)
+    sb.assert_element("img#captcha-success", timeout=3)
 
 
 with SB(uc=True, test=True) as sb:

examples/test_download_files.py

@@ -43,6 +43,7 @@ def test_download_files_from_pypi(self):
         if (
             self.browser == "safari"
             or self.browser == "ie"
+            or self.browser == "edge"
             or (self.is_chromium() and self.guest_mode)
             or (self.is_chromium() and (self.headless or self.headless2))
         ):

examples/uc_cdp_events.py

@@ -13,15 +13,15 @@ def add_cdp_listener(self):
         )
 
     def click_turnstile_and_verify(sb):
-        sb.driver.uc_switch_to_frame("iframe")
+        sb.switch_to_frame("iframe")
         sb.driver.uc_click("span.mark")
-        sb.assert_element("img#captcha-success", timeout=3.33)
+        sb.assert_element("img#captcha-success", timeout=3)
         sb.highlight("img#captcha-success", loops=8)
 
     def test_display_cdp_events(self):
         if not (self.undetectable and self.uc_cdp_events):
             self.get_new_driver(undetectable=True, uc_cdp_events=True)
-        self.driver.uc_open("https://seleniumbase.io/apps/turnstile")
+        self.driver.uc_open_with_reconnect("seleniumbase.io/apps/turnstile")
         self.add_cdp_listener()
         self.click_turnstile_and_verify()
         self.sleep(1)