seleniumbase 4.22.5__tar.gz → 4.23.0__tar.gz

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/.github/workflows/python-package.yml

@@ -24,13 +24,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install --upgrade wheel
+        python -m pip install --upgrade pip wheel setuptools
         pip install -r requirements.txt
     - name: Install SeleniumBase
       run: |

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.22.5
+Version: 4.23.0
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -81,18 +81,18 @@ Requires-Dist: sniffio==1.3.0
 Requires-Dist: h11==0.14.0
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: trio==0.22.2; python_version < "3.8"
-Requires-Dist: trio==0.23.2; python_version >= "3.8"
+Requires-Dist: trio==0.24.0; python_version >= "3.8"
 Requires-Dist: trio-websocket==0.11.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: selenium==4.11.2; python_version < "3.8"
-Requires-Dist: selenium==4.16.0; python_version >= "3.8"
+Requires-Dist: selenium==4.17.2; python_version >= "3.8"
 Requires-Dist: cssselect==1.2.0
 Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: fasteners==0.19
 Requires-Dist: execnet==2.0.2
 Requires-Dist: iniconfig==2.0.0
 Requires-Dist: pluggy==1.2.0; python_version < "3.8"
-Requires-Dist: pluggy==1.3.0; python_version >= "3.8"
+Requires-Dist: pluggy==1.4.0; python_version >= "3.8"
 Requires-Dist: py==1.11.0
 Requires-Dist: pytest==7.4.4
 Requires-Dist: pytest-html==2.0.1
@@ -105,7 +105,7 @@ Requires-Dist: sbvirtualdisplay==1.3.0
 Requires-Dist: behave==1.2.6
 Requires-Dist: soupsieve==2.4.1; python_version < "3.8"
 Requires-Dist: soupsieve==2.5; python_version >= "3.8"
-Requires-Dist: beautifulsoup4==4.12.2
+Requires-Dist: beautifulsoup4==4.12.3
 Requires-Dist: pygments==2.17.2
 Requires-Dist: pyreadline3==3.4.1; platform_system == "Windows"
 Requires-Dist: tabcompleter==1.3.0
@@ -127,10 +127,10 @@ Requires-Dist: coverage==7.4.0; python_version >= "3.8" and extra == "coverage"
 Requires-Dist: pytest-cov==4.1.0; extra == "coverage"
 Provides-Extra: flake8
 Requires-Dist: flake8==5.0.4; python_version < "3.9" and extra == "flake8"
-Requires-Dist: flake8==6.1.0; python_version >= "3.9" and extra == "flake8"
+Requires-Dist: flake8==7.0.0; python_version >= "3.9" and extra == "flake8"
 Requires-Dist: mccabe==0.7.0; extra == "flake8"
 Requires-Dist: pyflakes==2.5.0; python_version < "3.9" and extra == "flake8"
-Requires-Dist: pyflakes==3.1.0; python_version >= "3.9" and extra == "flake8"
+Requires-Dist: pyflakes==3.2.0; python_version >= "3.9" and extra == "flake8"
 Requires-Dist: pycodestyle==2.9.1; python_version < "3.9" and extra == "flake8"
 Requires-Dist: pycodestyle==2.11.1; python_version >= "3.9" and extra == "flake8"
 Provides-Extra: ipdb
@@ -140,7 +140,7 @@ Provides-Extra: pdfminer
 Requires-Dist: pdfminer.six==20221105; python_version < "3.8" and extra == "pdfminer"
 Requires-Dist: pdfminer.six==20231228; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: cryptography==39.0.2; python_version < "3.9" and extra == "pdfminer"
-Requires-Dist: cryptography==41.0.7; python_version >= "3.9" and extra == "pdfminer"
+Requires-Dist: cryptography==42.0.0; python_version >= "3.9" and extra == "pdfminer"
 Requires-Dist: cffi==1.15.1; python_version < "3.8" and extra == "pdfminer"
 Requires-Dist: cffi==1.16.0; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: pycparser==2.21; extra == "pdfminer"
@@ -148,7 +148,7 @@ Provides-Extra: pillow
 Requires-Dist: Pillow==9.5.0; python_version < "3.8" and extra == "pillow"
 Requires-Dist: Pillow==10.2.0; python_version >= "3.8" and extra == "pillow"
 Provides-Extra: psutil
-Requires-Dist: psutil==5.9.6; extra == "psutil"
+Requires-Dist: psutil==5.9.8; extra == "psutil"
 Provides-Extra: selenium-stealth
 Requires-Dist: selenium-stealth==1.0.6; extra == "selenium-stealth"
 Provides-Extra: selenium-wire
@@ -820,6 +820,7 @@ pytest test_coffee_cart.py --trace
 --firefox-pref=SET  # (Set a Firefox preference:value set, comma-separated.)
 --extension-zip=ZIP  # (Load a Chrome Extension .zip|.crx, comma-separated.)
 --extension-dir=DIR  # (Load a Chrome Extension directory, comma-separated.)
+--disable-features="F1,F2"  # (Disable features, comma-separated, no spaces.)
 --binary-location=PATH  # (Set path of the Chromium browser binary to use.)
 --driver-version=VER  # (Set the chromedriver or uc_driver version to use.)
 --sjw  # (Skip JS Waits for readyState to be "complete" or Angular to load.)
@@ -1471,22 +1472,24 @@ self.click("a.analytics")  # Clicks the generated button
 
 <h3>🔵 How to use deferred asserts:</h3>
 
-<p>Let's say you want to verify multiple different elements on a web page in a single test, but you don't want the test to fail until you verified several elements at once so that you don't have to rerun the test to find more missing elements on the same page. That's where deferred asserts come in. Here's the example:</p>
+<p>Let's say you want to verify multiple different elements on a web page in a single test, but you don't want the test to fail until you verified several elements at once so that you don't have to rerun the test to find more missing elements on the same page. That's where deferred asserts come in. Here's an example:</p>
 
 ```python
 from seleniumbase import BaseCase
 BaseCase.main(__name__, __file__)
 
-class MyTestClass(BaseCase):
+class DeferredAssertTests(BaseCase):
     def test_deferred_asserts(self):
-        self.open('https://xkcd.com/993/')
-        self.wait_for_element('#comic')
+        self.open("https://xkcd.com/993/")
+        self.wait_for_element("#comic")
         self.deferred_assert_element('img[alt="Brand Identity"]')
         self.deferred_assert_element('img[alt="Rocket Ship"]')  # Will Fail
-        self.deferred_assert_element('#comicmap')
-        self.deferred_assert_text('Fake Item', '#middleContainer')  # Will Fail
-        self.deferred_assert_text('Random', '#middleContainer')
+        self.deferred_assert_element("#comicmap")
+        self.deferred_assert_text("Fake Item", "ul.comicNav")  # Will Fail
+        self.deferred_assert_text("Random", "ul.comicNav")
         self.deferred_assert_element('a[name="Super Fake !!!"]')  # Will Fail
+        self.deferred_assert_exact_text("Brand Identity", "#ctitle")
+        self.deferred_assert_exact_text("Fake Food", "#comic")  # Will Fail
         self.process_deferred_asserts()
 ```
 

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/README.md

@@ -662,6 +662,7 @@ pytest test_coffee_cart.py --trace
 --firefox-pref=SET  # (Set a Firefox preference:value set, comma-separated.)
 --extension-zip=ZIP  # (Load a Chrome Extension .zip|.crx, comma-separated.)
 --extension-dir=DIR  # (Load a Chrome Extension directory, comma-separated.)
+--disable-features="F1,F2"  # (Disable features, comma-separated, no spaces.)
 --binary-location=PATH  # (Set path of the Chromium browser binary to use.)
 --driver-version=VER  # (Set the chromedriver or uc_driver version to use.)
 --sjw  # (Skip JS Waits for readyState to be "complete" or Angular to load.)
@@ -1313,22 +1314,24 @@ self.click("a.analytics")  # Clicks the generated button
 
 <h3>🔵 How to use deferred asserts:</h3>
 
-<p>Let's say you want to verify multiple different elements on a web page in a single test, but you don't want the test to fail until you verified several elements at once so that you don't have to rerun the test to find more missing elements on the same page. That's where deferred asserts come in. Here's the example:</p>
+<p>Let's say you want to verify multiple different elements on a web page in a single test, but you don't want the test to fail until you verified several elements at once so that you don't have to rerun the test to find more missing elements on the same page. That's where deferred asserts come in. Here's an example:</p>
 
 ```python
 from seleniumbase import BaseCase
 BaseCase.main(__name__, __file__)
 
-class MyTestClass(BaseCase):
+class DeferredAssertTests(BaseCase):
     def test_deferred_asserts(self):
-        self.open('https://xkcd.com/993/')
-        self.wait_for_element('#comic')
+        self.open("https://xkcd.com/993/")
+        self.wait_for_element("#comic")
         self.deferred_assert_element('img[alt="Brand Identity"]')
         self.deferred_assert_element('img[alt="Rocket Ship"]')  # Will Fail
-        self.deferred_assert_element('#comicmap')
-        self.deferred_assert_text('Fake Item', '#middleContainer')  # Will Fail
-        self.deferred_assert_text('Random', '#middleContainer')
+        self.deferred_assert_element("#comicmap")
+        self.deferred_assert_text("Fake Item", "ul.comicNav")  # Will Fail
+        self.deferred_assert_text("Random", "ul.comicNav")
         self.deferred_assert_element('a[name="Super Fake !!!"]')  # Will Fail
+        self.deferred_assert_exact_text("Brand Identity", "#ctitle")
+        self.deferred_assert_exact_text("Fake Food", "#comic")  # Will Fail
         self.process_deferred_asserts()
 ```
 

seleniumbase-4.23.0/examples/boilerplates/boilerplate_test.py

@@ -0,0 +1,14 @@
+try:  # Run with "pytest" (relative imports are valid)
+    from .base_test_case import BaseTestCase
+    from .page_objects import Page
+except (ImportError, ValueError):  # Run with "python"
+    from base_test_case import BaseTestCase
+    from page_objects import Page
+    BaseTestCase.main(__name__, __file__)
+
+
+class MyTestClass(BaseTestCase):
+    def test_boilerplate(self):
+        self.login()
+        self.example_method()
+        self.assert_element(Page.html)

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/github_test.py

@@ -15,6 +15,6 @@ class GitHubTests(BaseCase):
         self.highlight("div.Layout-sidebar")
         self.assert_element("div.repository-content")
         self.assert_text("SeleniumBase", "strong a")
-        self.click('a[title="seleniumbase"]')
+        self.js_click('a[title="seleniumbase"]')
         self.slow_click('td[class*="large"] a[title="fixtures"]')
         self.assert_element('td[class*="large"] a[title="base_case.py"]')

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/raw_parameter_script.py

@@ -81,6 +81,7 @@ if pure_python:
     sb.window_size = None
     sb.maximize_option = False
     sb.visual_baseline = False
+    sb.disable_features = None
     sb._disable_beforeunload = False
     sb.save_screenshot_after_test = False
     sb.no_screenshot_after_test = False

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/test_docs_site.py

@@ -6,15 +6,15 @@ class DocsSiteTests(BaseCase):
     def test_docs(self):
         self.open("https://seleniumbase.io/help_docs/customizing_test_runs/")
         self.assert_text("Command Line Options", "h1")
-        self.js_click('a[href="../../examples/example_logs/ReadMe/"]')
+        self.js_click('a[href$="/examples/example_logs/ReadMe/"]')
         self.assert_text("Dashboard / Reports", "h1")
-        self.js_click('a[href*="/seleniumbase/console_scripts/ReadMe/"]')
+        self.js_click('a[href$="/seleniumbase/console_scripts/ReadMe/"]')
         self.assert_text("Console Scripts", "h1")
-        self.js_click('a[href="../../../help_docs/syntax_formats/"]')
+        self.js_click('a[href$="/help_docs/syntax_formats/"]')
         self.assert_text("Syntax Formats", "h1")
-        self.js_click('a[href="../recorder_mode/"]')
+        self.js_click('a[href$="/recorder_mode/"]')
         self.assert_text("Recorder Mode", "h1")
-        self.js_click('a[href="../method_summary/"]')
+        self.js_click('a[href$="/method_summary/"]')
         self.assert_text("API Reference", "h1")
         self.click('img[alt="logo"]')
         self.assert_text("SeleniumBase", "h1")

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/test_download_images.py

@@ -6,6 +6,9 @@ BaseCase.main(__name__, __file__)
 
 class DownloadImages(BaseCase):
     def test_download_images_directly(self):
+        if self._multithreaded:
+            self.open_if_not_url("about:blank")
+            self.skip("Skipping test in multi-threaded mode.")
         self.open("seleniumbase.io/examples/chart_maker/ReadMe")
         img_elements_with_src = self.find_elements("img[src]")
         unique_src_values = []
@@ -27,7 +30,6 @@ class DownloadImages(BaseCase):
     def test_download_images_via_screenshot(self):
         if self.recorder_mode:
             self.open("about:blank")
-            print("Skipping test in Recorder Mode.")
             self.skip("Skipping test in Recorder Mode.")
         self.open("seleniumbase.io/error_page/")
         img_elements_with_src = self.find_elements("img[src]")

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/test_hack_search.py

@@ -24,8 +24,8 @@ class HackingTests(BaseCase):
         self.highlight("h1.b_logo", loops=8)
         self.highlight_click('[href*="github.com/seleniumbase/SeleniumBase"]')
         self.highlight_click('[href="/seleniumbase/SeleniumBase"]')
-        self.highlight_click('a[title="examples"]')
-        self.assert_text("examples", "#file-name-id-wide")
+        self.assert_text("SeleniumBase", "strong a")
+        self.js_click('a[title="examples"]')
         self.highlight('td[class*="large"] a[title="test_hack_search.py"]')
         self.click('td[class*="large"] a[title="test_hack_search.py"]')
         self.assert_text("test_hack_search.py", "#file-name-id-wide")

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/test_todomvc.py

@@ -8,7 +8,7 @@ class TodoMVC(BaseCase):
     def test_todomvc(self, framework):
         self.open("https://todomvc.com/")
         self.clear_local_storage()
-        self.click('a[href="examples/%s"]' % framework)
+        self.click('a[href*="examples/%s/dist"]' % framework)
         self.assert_element("section.todoapp")
         self.assert_text("todos", "header h1")
         self.wait_for_ready_state_complete()
@@ -25,5 +25,5 @@ class TodoMVC(BaseCase):
         self.check_if_unchecked("ul.todo-list li:nth-of-type(2) input")
         self.check_if_unchecked("ul.todo-list li:nth-of-type(3) input")
         self.assert_text("0 items left", todo_count_span)
-        self.click('label[for="toggle-all"]')
-        self.assert_text("3 items left", todo_count_span)
+        self.click("button.clear-completed")
+        self.assert_element_not_visible(todo_count_span)

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/examples/translations/russian_test_1.py

@@ -7,7 +7,7 @@ class МойТестовыйКласс(ТестНаСелен):
     def test_пример_1(self):
         self.открыть("https://ru.wikipedia.org/wiki/")
         self.подтвердить_элемент('[title="Русский язык"]')
-        self.подтвердить_текст("Википедия", "h2.main-wikimedia-header")
+        self.подтвердить_текст("Википедия", "div.main-wikimedia-header")
         self.введите("#searchInput", "МГУ")
         self.нажмите("#searchButton")
         self.подтвердить_текст("университет", "#firstHeading")

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/help_docs/customizing_test_runs.md

@@ -138,6 +138,7 @@ pytest my_first_test.py --settings-file=custom_settings.py
 --firefox-pref=SET  # (Set a Firefox preference:value set, comma-separated.)
 --extension-zip=ZIP  # (Load a Chrome Extension .zip|.crx, comma-separated.)
 --extension-dir=DIR  # (Load a Chrome Extension directory, comma-separated.)
+--disable-features="F1,F2"  # (Disable features, comma-separated, no spaces.)
 --binary-location=PATH  # (Set path of the Chromium browser binary to use.)
 --driver-version=VER  # (Set the chromedriver or uc_driver version to use.)
 --sjw  # (Skip JS Waits for readyState to be "complete" or Angular to load.)

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/mkdocs_build/requirements.txt

@@ -3,12 +3,12 @@
 
 regex>=2023.12.25
 pymdown-extensions>=10.7
-pipdeptree>=2.13.1
+pipdeptree>=2.13.2
 python-dateutil>=2.8.2
-Markdown==3.5.1
+Markdown==3.5.2
 markdown2==2.4.12
-MarkupSafe==2.1.3
-Jinja2==3.1.2
+MarkupSafe==2.1.4
+Jinja2==3.1.3
 click==8.1.7
 ghp-import==2.1.0
 watchdog==3.0.0
@@ -16,11 +16,11 @@ cairocffi==1.6.1
 pathspec==0.12.1
 Babel==2.14.0
 paginate==0.5.6
-lxml==5.0.0
+lxml==5.1.0
 pyquery==2.0.0
 readtime==3.0.0
 mkdocs==1.5.3
-mkdocs-material==9.5.3
+mkdocs-material==9.5.5
 mkdocs-exclude-search==0.6.6
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.3.1

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/requirements.txt

@@ -24,18 +24,18 @@ sniffio==1.3.0
 h11==0.14.0
 outcome==1.3.0.post0
 trio==0.22.2;python_version<"3.8"
-trio==0.23.2;python_version>="3.8"
+trio==0.24.0;python_version>="3.8"
 trio-websocket==0.11.1
 wsproto==1.2.0
 selenium==4.11.2;python_version<"3.8"
-selenium==4.16.0;python_version>="3.8"
+selenium==4.17.2;python_version>="3.8"
 cssselect==1.2.0
 sortedcontainers==2.4.0
 fasteners==0.19
 execnet==2.0.2
 iniconfig==2.0.0
 pluggy==1.2.0;python_version<"3.8"
-pluggy==1.3.0;python_version>="3.8"
+pluggy==1.4.0;python_version>="3.8"
 py==1.11.0
 pytest==7.4.4
 pytest-html==2.0.1
@@ -48,7 +48,7 @@ sbvirtualdisplay==1.3.0
 behave==1.2.6
 soupsieve==2.4.1;python_version<"3.8"
 soupsieve==2.5;python_version>="3.8"
-beautifulsoup4==4.12.2
+beautifulsoup4==4.12.3
 pygments==2.17.2
 pyreadline3==3.4.1;platform_system=="Windows"
 tabcompleter==1.3.0
@@ -70,9 +70,9 @@ coverage==7.4.0;python_version>="3.8"
 pytest-cov==4.0.0;python_version<"3.7"
 pytest-cov==4.1.0;python_version>="3.7"
 flake8==5.0.4;python_version<"3.9"
-flake8==6.1.0;python_version>="3.9"
+flake8==7.0.0;python_version>="3.9"
 mccabe==0.7.0
 pyflakes==2.5.0;python_version<"3.9"
-pyflakes==3.1.0;python_version>="3.9"
+pyflakes==3.2.0;python_version>="3.9"
 pycodestyle==2.9.1;python_version<"3.9"
 pycodestyle==2.11.1;python_version>="3.9"

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.22.5"
+__version__ = "4.23.0"

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/seleniumbase/behave/behave_sb.py

@@ -226,6 +226,7 @@ def get_configured_sb(context):
     sb.chromium_arg = None
     sb.firefox_arg = None
     sb.firefox_pref = None
+    sb.disable_features = None
     sb.proxy_string = None
     sb.proxy_bypass_list = None
     sb.proxy_pac_url = None
@@ -748,6 +749,13 @@ def get_configured_sb(context):
                 firefox_pref = sb.firefox_pref  # revert to default
             sb.firefox_pref = firefox_pref
             continue
+        # Handle: -D disable-features="F1,F2" / disable_features="F1,F2"
+        if low_key in ["disable-features", "disable_features"]:
+            disable_features = userdata[key]
+            if disable_features == "true":
+                disable_features = sb.disable_features  # revert to default
+            sb.disable_features = disable_features
+            continue
         # Handle: -D proxy=SERVER:PORT / proxy=USERNAME:PASSWORD@SERVER:PORT
         if low_key in ["proxy", "proxy-server", "proxy-string"]:
             proxy_string = userdata[key]

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/seleniumbase/console_scripts/run.py

@@ -75,10 +75,11 @@ def show_basic_usage():
     seleniumbase_logo = logo_helper.get_seleniumbase_logo()
     print(seleniumbase_logo)
     print("")
-    time.sleep(0.25)  # Enough time to see the logo
+    time.sleep(0.28)  # Enough time to see the logo
     show_package_location()
     show_version_info()
     print("")
+    time.sleep(0.72)  # Enough time to see the version
     sc = ""
     sc += ' * USAGE: "seleniumbase [COMMAND] [PARAMETERS]"\n'
     sc += ' *    OR:        "sbase [COMMAND] [PARAMETERS]"\n'

{seleniumbase-4.22.5 → seleniumbase-4.23.0}/seleniumbase/core/browser_launcher.py

@@ -763,6 +763,7 @@ def _set_chrome_options(
     user_data_dir,
     extension_zip,
     extension_dir,
+    disable_features,
     binary_location,
     driver_version,
     page_load_strategy,
@@ -1044,6 +1045,7 @@ def _set_chrome_options(
                 binary_loc = detect_b_ver.get_binary_location(br_app, True)
                 if os.path.exists(binary_loc):
                     binary_location = binary_loc
+    extra_disabled_features = []
     if chromium_arg:
         # Can be a comma-separated list of Chromium args
         chromium_arg_list = chromium_arg.split(",")
@@ -1069,8 +1071,13 @@ def _set_chrome_options(
                 )
                 if os.path.exists(binary_loc):
                     binary_location = binary_loc
+            elif "disable-features=" in chromium_arg_item:
+                d_f = chromium_arg_item.split("disable-features=")[-1]
+                extra_disabled_features.append(d_f)
             elif len(chromium_arg_item) >= 3:
                 chrome_options.add_argument(chromium_arg_item)
+    if disable_features:
+        extra_disabled_features.extend(disable_features.split(","))
     if devtools and not headless:
         chrome_options.add_argument("--auto-open-devtools-for-tabs")
     if user_agent:
@@ -1089,19 +1096,36 @@ def _set_chrome_options(
     if headless or headless2 or is_using_uc(undetectable, browser_name):
         chrome_options.add_argument("--disable-renderer-backgrounding")
     chrome_options.add_argument("--disable-backgrounding-occluded-windows")
+    chrome_options.add_argument("--disable-client-side-phishing-detection")
+    chrome_options.add_argument("--disable-oopr-debug-crash-dump")
+    chrome_options.add_argument("--disable-top-sites")
     chrome_options.add_argument("--ash-no-nudges")
+    chrome_options.add_argument("--no-crash-upload")
     chrome_options.add_argument("--deny-permission-prompts")
+    included_disabled_features = []
     if user_data_dir:
-        chrome_options.add_argument(
-            "--disable-features=OptimizationHintsFetching,Translate,"
-            "OptimizationTargetPrediction,PrivacySandboxSettings4,"
-            "DownloadBubble,DownloadBubbleV2"
-        )
+        included_disabled_features.append("OptimizationHintsFetching")
+        included_disabled_features.append("Translate")
+        included_disabled_features.append("OptimizationTargetPrediction")
+        included_disabled_features.append("PrivacySandboxSettings4")
+        included_disabled_features.append("DownloadBubble")
+        included_disabled_features.append("DownloadBubbleV2")
+        for item in extra_disabled_features:
+            if item not in included_disabled_features:
+                included_disabled_features.append(item)
+        d_f_string = ",".join(included_disabled_features)
+        chrome_options.add_argument("--disable-features=%s" % d_f_string)
     else:
-        chrome_options.add_argument(
-            "--disable-features=OptimizationHintsFetching,Translate,"
-            "OptimizationTargetPrediction,DownloadBubble,DownloadBubbleV2"
-        )
+        included_disabled_features.append("OptimizationHintsFetching")
+        included_disabled_features.append("Translate")
+        included_disabled_features.append("OptimizationTargetPrediction")
+        included_disabled_features.append("DownloadBubble")
+        included_disabled_features.append("DownloadBubbleV2")
+        for item in extra_disabled_features:
+            if item not in included_disabled_features:
+                included_disabled_features.append(item)
+        d_f_string = ",".join(included_disabled_features)
+        chrome_options.add_argument("--disable-features=%s" % d_f_string)
     if (
         is_using_uc(undetectable, browser_name)
         and (
@@ -1338,6 +1362,7 @@ def get_driver(
     user_data_dir=None,
     extension_zip=None,
     extension_dir=None,
+    disable_features=None,
     binary_location=None,
     driver_version=None,
     page_load_strategy=None,
@@ -1550,6 +1575,7 @@ def get_driver(
             user_data_dir,
             extension_zip,
             extension_dir,
+            disable_features,
             binary_location,
             driver_version,
             page_load_strategy,
@@ -1605,6 +1631,7 @@ def get_driver(
             user_data_dir,
             extension_zip,
             extension_dir,
+            disable_features,
             binary_location,
             driver_version,
             page_load_strategy,
@@ -1664,6 +1691,7 @@ def get_remote_driver(
     user_data_dir,
     extension_zip,
     extension_dir,
+    disable_features,
     binary_location,
     driver_version,
     page_load_strategy,
@@ -1784,6 +1812,7 @@ def get_remote_driver(
             user_data_dir,
             extension_zip,
             extension_dir,
+            disable_features,
             binary_location,
             driver_version,
             page_load_strategy,
@@ -1955,6 +1984,7 @@ def get_remote_driver(
             user_data_dir,
             extension_zip,
             extension_dir,
+            disable_features,
             binary_location,
             driver_version,
             page_load_strategy,
@@ -2075,6 +2105,7 @@ def get_local_driver(
     user_data_dir,
     extension_zip,
     extension_dir,
+    disable_features,
     binary_location,
     driver_version,
     page_load_strategy,
@@ -2570,18 +2601,6 @@ def get_local_driver(
         edge_options.add_argument(
             "--disable-autofill-keyboard-accessory-view[8]"
         )
-        edge_options.add_argument("--ash-no-nudges")
-        edge_options.add_argument("--deny-permission-prompts")
-        if user_data_dir:
-            edge_options.add_argument(
-                "--disable-features=OptimizationHintsFetching,Translate,"
-                "OptimizationTargetPrediction,PrivacySandboxSettings4"
-            )
-        else:
-            edge_options.add_argument(
-                "--disable-features=OptimizationHintsFetching,Translate,"
-                "OptimizationTargetPrediction"
-            )
         edge_options.add_argument("--disable-browser-side-navigation")
         edge_options.add_argument("--disable-translate")
         if not enable_ws:
@@ -2596,6 +2615,12 @@ def get_local_driver(
         if headless or headless2 or is_using_uc(undetectable, browser_name):
             edge_options.add_argument("--disable-renderer-backgrounding")
         edge_options.add_argument("--disable-backgrounding-occluded-windows")
+        edge_options.add_argument("--disable-client-side-phishing-detection")
+        edge_options.add_argument("--disable-oopr-debug-crash-dump")
+        edge_options.add_argument("--disable-top-sites")
+        edge_options.add_argument("--ash-no-nudges")
+        edge_options.add_argument("--no-crash-upload")
+        edge_options.add_argument("--deny-permission-prompts")
         if (
             page_load_strategy
             and page_load_strategy.lower() in ["eager", "none"]
@@ -2677,6 +2702,7 @@ def get_local_driver(
             edge_options.add_argument("--disable-gpu")
         if IS_LINUX:
             edge_options.add_argument("--disable-dev-shm-usage")
+        extra_disabled_features = []
         set_binary = False
         if chromium_arg:
             # Can be a comma-separated list of Chromium args
@@ -2690,8 +2716,33 @@ def get_local_driver(
                         chromium_arg_item = "--" + chromium_arg_item
                 if "set-binary" in chromium_arg_item:
                     set_binary = True
+                elif "disable-features=" in chromium_arg_item:
+                    d_f = chromium_arg_item.split("disable-features=")[-1]
+                    extra_disabled_features.append(d_f)
                 elif len(chromium_arg_item) >= 3:
                     edge_options.add_argument(chromium_arg_item)
+        if disable_features:
+            extra_disabled_features.extend(disable_features.split(","))
+        included_disabled_features = []
+        if user_data_dir:
+            included_disabled_features.append("OptimizationHintsFetching")
+            included_disabled_features.append("Translate")
+            included_disabled_features.append("OptimizationTargetPrediction")
+            included_disabled_features.append("PrivacySandboxSettings4")
+            for item in extra_disabled_features:
+                if item not in included_disabled_features:
+                    included_disabled_features.append(item)
+            d_f_string = ",".join(included_disabled_features)
+            edge_options.add_argument("--disable-features=%s" % d_f_string)
+        else:
+            included_disabled_features.append("OptimizationHintsFetching")
+            included_disabled_features.append("Translate")
+            included_disabled_features.append("OptimizationTargetPrediction")
+            for item in extra_disabled_features:
+                if item not in included_disabled_features:
+                    included_disabled_features.append(item)
+            d_f_string = ",".join(included_disabled_features)
+            edge_options.add_argument("--disable-features=%s" % d_f_string)
         if (set_binary or IS_LINUX) and not binary_location:
             br_app = "edge"
             binary_loc = detect_b_ver.get_binary_location(br_app)
@@ -2831,6 +2882,7 @@ def get_local_driver(
                 user_data_dir,
                 extension_zip,
                 extension_dir,
+                disable_features,
                 binary_location,
                 driver_version,
                 page_load_strategy,
@@ -3348,6 +3400,7 @@ def get_local_driver(
                                         None,  # user_data_dir
                                         None,  # extension_zip
                                         None,  # extension_dir
+                                        None,  # disable_features
                                         binary_location,
                                         driver_version,
                                         page_load_strategy,
@@ -3565,6 +3618,7 @@ def get_local_driver(
                         None,  # user_data_dir
                         None,  # extension_zip
                         None,  # extension_dir
+                        None,  # disable_features
                         binary_location,
                         driver_version,
                         page_load_strategy,