Merge pull request #446 from seleniumbase/update-remote-chrome-and-other-things

Update Chrome options when running remotely (and more)

Author: mdmintz

README.md

@@ -1,4 +1,4 @@
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb10.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb12.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 [<img src="https://img.shields.io/github/release/seleniumbase/SeleniumBase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/releases) [<img src="https://dev.azure.com/seleniumbase/seleniumbase/_apis/build/status/seleniumbase.SeleniumBase?branchName=master" alt=" " />](https://dev.azure.com/seleniumbase/seleniumbase/_build/latest?definitionId=1&branchName=master) [<img src="https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master" alt=" " />](https://travis-ci.org/seleniumbase/SeleniumBase) [<img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt=" " />](https://gitter.im/seleniumbase/SeleniumBase) [<img src="https://img.shields.io/badge/license-MIT-22BBCC.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [<img src="https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/stargazers)
 

examples/upload_file_test.py

@@ -8,10 +8,7 @@ class FileUploadButtonTests(BaseCase):
     def test_file_upload_button(self):
         self.open("https://www.w3schools.com/jsref/tryit.asp"
                   "?filename=tryjsref_fileupload_get")
-        if not self.ad_block_on:
-            # If ad-blocking is disabled, block anyway.
-            self.wait_for_element('[id*="google_ads"]')
-            self.remove_elements('[id*="google_ads"]')
+        self.ad_block()
         self.switch_to_frame('iframeResult')
         self.add_css_style(
             'input[type="file"]{zoom: 1.5;-moz-transform: scale(1.5);}')

help_docs/features_list.md

@@ -1,4 +1,4 @@
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_sb9.png" title="SeleniumBase" height="48">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 <a id="feature_list"></a>
 ## <img src="https://cdn2.hubspot.net/hubfs/100006/images/super_square_logo_3a.png" title="SeleniumBase" height="32"> **Features:**

seleniumbase/config/ad_block_list.py

@@ -18,19 +18,21 @@
 
 AD_BLOCK_LIST = [
     'script[src*="/adservice."]',
-    'script[type="data-doubleclick"]',
     'script[src*="doubleclick.net"]',
-    'script[src*="googletagservices.com/"]',
-    'script[src*="ad.doubleclick.net/"]',
+    'script[src*="googletagservices.com"]',
+    'script[src*="doubleclick.net"]',
     'script[src*="adsbygoogle.js"]',
     'script[src*="adroll.com"]',
     'script[src*="/pagead/"]',
-    'iframe[onload*="doWithAds"]',
+    'script[src*="ads-host"]',
+    'script[src*="adsystem.com"]',
+    'script[type="data-doubleclick"]',
     'iframe[src*="doubleclick.net"]',
+    'iframe[onload*="doWithAds"]',
     'iframe[id*="google_ads_frame"]',
     '[aria-label="Ad"]',
-    '[class^="sponsored-content"]',
-    '[class="adsbygoogle"]',
+    '[class*="sponsored-content"]',
+    '[class*="adsbygoogle"]',
     '[class^="adroll"]',
     '[data-ad-details*="Advertisement"]',
     '[data-native_ad*="placement"]',
@@ -39,6 +41,12 @@
     '[data-track-event-label*="-taboola-"]',
     '[data-ad-feedback-beacon*="AD_"]',
     '[data-ad-feedback-beacon]',
+    '[data-dcm-click-tracker*="/adclick."]',
+    '[data-google-query-id]',
+    '[data-ylk*="pkgt:sponsored_cluster"]',
+    '[data-google-av-cxn*="pagead2"]',
+    '[data-ad-client]',
+    '[data-ad-slot]',
     '[href*="doubleclick.net/"]',
     '[href*="amazon-adsystem"]',
     '[alt="Advertisement"]',
@@ -51,17 +59,13 @@
     '[id^="outbrain_widget"]',
     '[id^="taboola-"]',
     '[id^="google_ads_frame"]',
+    '[id^="google_ads_iframe"]',
+    '[id="tryitLeaderboard"]',
     '[id="dianomiRightRail"]',
     '[src*="smartads."]',
     '[src*="ad_nexus"]',
     '[src*="/ads/"]',
     '[allow*="advertising.com"]',
-    '[data-dcm-click-tracker*="/adclick."]',
-    '[data-google-query-id^="C"]',
-    '[data-ylk*="pkgt:sponsored_cluster"]',
-    '[data-google-av-cxn*="pagead2"]',
-    '[data-ad-client]',
-    '[data-ad-slot]',
     'ins.adsbygoogle',
     'li.strm-ad-clusters',
     'li.js-stream-ad',

seleniumbase/core/browser_launcher.py

@@ -125,8 +125,8 @@ def _add_chrome_disable_csp_extension(chrome_options):
 def _set_chrome_options(
         downloads_path, headless, proxy_string, proxy_auth,
         proxy_user, proxy_pass, user_agent, disable_csp, enable_sync,
-        user_data_dir, extension_zip, extension_dir, mobile_emulator,
-        device_width, device_height, device_pixel_ratio):
+        user_data_dir, extension_zip, extension_dir, servername,
+        mobile_emulator, device_width, device_height, device_pixel_ratio):
     chrome_options = webdriver.ChromeOptions()
     prefs = {
         "download.default_directory": downloads_path,
@@ -140,7 +140,8 @@ def _set_chrome_options(
     chrome_options.add_experimental_option("w3c", True)
     chrome_options.add_experimental_option(
         "excludeSwitches", ["enable-automation"])
-    chrome_options.add_experimental_option("useAutomationExtension", False)
+    if servername == "localhost" or servername == "127.0.0.1":
+        chrome_options.add_experimental_option("useAutomationExtension", False)
     if mobile_emulator:
         emulator_settings = {}
         device_metrics = {}
@@ -359,7 +360,7 @@ def get_driver(browser_name, headless=False, use_grid=False,
             device_width, device_height, device_pixel_ratio)
     else:
         return get_local_driver(
-            browser_name, headless,
+            browser_name, headless, servername,
             proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
             disable_csp, enable_sync, user_data_dir,
             extension_zip, extension_dir, mobile_emulator,
@@ -381,8 +382,8 @@ def get_remote_driver(
         chrome_options = _set_chrome_options(
             downloads_path, headless, proxy_string, proxy_auth,
             proxy_user, proxy_pass, user_agent, disable_csp, enable_sync,
-            user_data_dir, extension_zip, extension_dir, mobile_emulator,
-            device_width, device_height, device_pixel_ratio)
+            user_data_dir, extension_zip, extension_dir, servername,
+            mobile_emulator, device_width, device_height, device_pixel_ratio)
         capabilities = chrome_options.to_capabilities()
         for key in desired_caps.keys():
             capabilities[key] = desired_caps[key]
@@ -489,7 +490,7 @@ def get_remote_driver(
 
 
 def get_local_driver(
-        browser_name, headless,
+        browser_name, headless, servername,
         proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
         disable_csp, enable_sync, user_data_dir,
         extension_zip, extension_dir,
@@ -563,7 +564,7 @@ def get_local_driver(
                 downloads_path, headless,
                 proxy_string, proxy_auth, proxy_user, proxy_pass,
                 user_agent, disable_csp, enable_sync, user_data_dir,
-                extension_zip, extension_dir, mobile_emulator,
+                extension_zip, extension_dir, servername, mobile_emulator,
                 device_width, device_height, device_pixel_ratio)
             return webdriver.Chrome(executable_path=LOCAL_EDGEDRIVER,
                                     options=chrome_options)
@@ -588,7 +589,7 @@ def get_local_driver(
                 downloads_path, headless,
                 proxy_string, proxy_auth, proxy_user, proxy_pass,
                 user_agent, disable_csp, enable_sync, user_data_dir,
-                extension_zip, extension_dir, mobile_emulator,
+                extension_zip, extension_dir, servername, mobile_emulator,
                 device_width, device_height, device_pixel_ratio)
             if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
                 make_driver_executable_if_not(LOCAL_CHROMEDRIVER)

seleniumbase/fixtures/base_case.py

@@ -1893,6 +1893,7 @@ def remove_elements(self, selector, by=By.CSS_SELECTOR):
         self.safe_execute_script(remove_script)
 
     def ad_block(self):
+        self.wait_for_ready_state_complete()
         from seleniumbase.config import ad_block_list
         for css_selector in ad_block_list.AD_BLOCK_LIST:
             css_selector = re.escape(css_selector)
@@ -4218,7 +4219,7 @@ def setUp(self, masterqa_mode=False):
             raise Exception("""SeleniumBase plugins did not load! """
                             """Please reinstall using:\n"""
                             """ >>> "pip install -r requirements.txt" <<<\n"""
-                            """ >>> "python setup.py develop" <<< """)
+                            """ >>> "python setup.py install" <<< """)
         if self.settings_file:
             settings_parser.set_settings(self.settings_file)
         # Mobile Emulator device metrics: CSS Width, CSS Height, & Pixel-Ratio

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.34.1',
+    version='1.34.2',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',