Update the built-in ad-blocker

Author: mdmintz

seleniumbase/config/ad_block_list.py

@@ -69,7 +69,7 @@
     "[data-google-av-adk]",
     "[data-google-query-id]",
     '[data-ylk*="sponsored_cluster"]',
-    '[data-google-av-cxn*="pagead"]',
+    "[data-google-av-cxn]",
     "[data-ad-client]",
     "[data-ad-slot]",
     '[href*="doubleclick"]',
@@ -108,4 +108,5 @@
     'link[href*="/adservice."]',
     "section.dianomi-ad",
     "ytd-promoted-video-renderer",
+    "ytd-video-masthead-ad-v3-renderer",
 ]

seleniumbase/fixtures/base_case.py

@@ -2900,10 +2900,10 @@ def wait_for_ready_state_complete(self, timeout=None):
             # For Chromium browsers in headed mode, the extension is used
             current_url = self.get_current_url()
             if not current_url == self.__last_page_load_url:
-                self.ad_block()
-                if self.is_element_present("iframe"):
-                    time.sleep(0.1)  # iframe ads take slightly longer to load
-                    self.ad_block()  # Do ad_block on slower-loading iframes
+                if page_actions.is_element_present(
+                    self.driver, "iframe", By.CSS_SELECTOR
+                ):
+                    self.ad_block()
                 self.__last_page_load_url = current_url
         return is_ready
 
@@ -3813,7 +3813,7 @@ def ad_block(self):
         """ Block ads that appear on the current web page. """
         from seleniumbase.config import ad_block_list
 
-        self.__check_scope()
+        self.__check_scope()  # Using wait_for_RSC would cause an infinite loop
         for css_selector in ad_block_list.AD_BLOCK_LIST:
             css_selector = re.escape(css_selector)  # Add "\\" to special chars
             css_selector = self.__escape_quotes_if_needed(css_selector)

seleniumbase/plugins/pytest_plugin.py

@@ -627,6 +627,7 @@ def pytest_addoption(parser):
                 every page load.""",
     )
     parser.addoption(
+        "--adblock",
         "--ad_block",
         "--ad-block",
         "--block_ads",

seleniumbase/plugins/selenium_plugin.py

@@ -388,6 +388,7 @@ def options(self, parser, env):
                     every page load.""",
         )
         parser.add_option(
+            "--adblock",
             "--ad_block",
             "--ad-block",
             "--block_ads",