Update the undetected chromedriver tests

Author: mdmintz

examples/uc_cdp_events.py

@@ -7,17 +7,36 @@
 
 
 class CDPTests(BaseCase):
-    def test_display_cdp_events(self):
-        if not (self.undetectable and self.uc_cdp_events and self.incognito):
-            self.get_new_driver(
-                undetectable=True, uc_cdp_events=True, incognito=True
-            )
+    def add_cdp_listener(self):
         # (To print everything, use "*". Otherwise select specific headers.)
         # self.driver.add_cdp_listener("*", lambda data: print(pformat(data)))
         self.driver.add_cdp_listener(
             "Network.requestWillBeSentExtraInfo",
             lambda data: print(pformat(data))
         )
-        self.open("https://nowsecure.nl/#relax")
-        self.assert_text("OH YEAH, you passed!", "h1", timeout=7.25)
+
+    def verify_success(self):
+        self.assert_text("OH YEAH, you passed!", "h1", timeout=6.25)
         self.sleep(2)
+
+    def fail_me(self):
+        self.fail('Selenium was detected! Try using: "pytest --uc"')
+
+    def test_display_cdp_events(self):
+        if not (self.undetectable and self.uc_cdp_events and self.incognito):
+            self.get_new_driver(
+                undetectable=True, uc_cdp_events=True, incognito=True
+            )
+        self.add_cdp_listener()
+        self.open("https://nowsecure.nl/#relax")
+        try:
+            self.verify_success()
+        except Exception:
+            self.clear_all_cookies()
+            self.get_new_driver(devtools=True)
+            self.add_cdp_listener()
+            self.open("https://nowsecure.nl/#relax")
+            try:
+                self.verify_success()
+            except Exception:
+                self.fail_me()

examples/verify_undetected.py

@@ -5,12 +5,12 @@
 
 if __name__ == "__main__":
     from pytest import main
-    main([__file__, "--uc", "--uc-cdp", "--incognito", "-s"])
+    main([__file__, "--uc", "-s"])
 
 
 class UndetectedTest(BaseCase):
     def verify_success(self):
-        self.assert_text("OH YEAH, you passed!", "h1", timeout=7.25)
+        self.assert_text("OH YEAH, you passed!", "h1", timeout=6.25)
         self.post_message("Selenium wasn't detected!", duration=2.8)
         self._print("\n Success! Website did not detect Selenium! ")
 
@@ -22,13 +22,9 @@ def test_browser_is_undetected(self):
         try:
             self.verify_success()
         except Exception:
-            if self.is_element_visible('input[value*="Verify"]'):
-                self.click('input[value*="Verify"]')
-            elif self.is_element_visible('iframe[title*="challenge"]'):
-                self.switch_to_frame('iframe[title*="challenge"]')
-                self.click("span.mark")
-            else:
-                self.fail_me()
+            self.clear_all_cookies()
+            self.get_new_driver(devtools=True)
+            self.open("https://nowsecure.nl/#relax")
             try:
                 self.verify_success()
             except Exception: