move to chromium/options.py to support Edge

Author: navin772

py/conftest.py

@@ -237,8 +237,8 @@ def get_options(driver_class, config):
         options.web_socket_url = True
         options.unhandled_prompt_behavior = "ignore"
 
-        # Enable webextensions for Chrome when BiDi is enabled
-        if driver_class == "Chrome" and hasattr(options, "enable_webextensions"):
+        # Enable webextensions for Chromium-based browsers when BiDi is enabled
+        if driver_class in ("Chrome", "Edge") and hasattr(options, "enable_webextensions"):
             options.enable_webextensions = True
 
     return options

py/selenium/webdriver/chrome/options.py

@@ -22,47 +22,10 @@
 
 
 class Options(ChromiumOptions):
-    def __init__(self) -> None:
-        super().__init__()
-        self._enable_webextensions = False
-
     @property
     def default_capabilities(self) -> dict:
         return DesiredCapabilities.CHROME.copy()
 
-    @property
-    def enable_webextensions(self) -> bool:
-        """Returns whether webextension support is enabled for Chrome.
-
-        :Returns: True if webextension support is enabled, False otherwise.
-        """
-        return self._enable_webextensions
-
-    @enable_webextensions.setter
-    def enable_webextensions(self, value: bool) -> None:
-        """Enables or disables webextension support for Chrome.
-
-        When enabled, this automatically adds the required Chrome flags:
-        - --enable-unsafe-extension-debugging
-        - --remote-debugging-pipe
-
-        :Args:
-         - value: True to enable webextension support, False to disable.
-        """
-        self._enable_webextensions = value
-        if value:
-            # Add required flags for Chrome webextension support
-            required_flags = ["--enable-unsafe-extension-debugging", "--remote-debugging-pipe"]
-            for flag in required_flags:
-                if flag not in self._arguments:
-                    self.add_argument(flag)
-        else:
-            # Remove webextension flags if disabling
-            flags_to_remove = ["--enable-unsafe-extension-debugging", "--remote-debugging-pipe"]
-            for flag in flags_to_remove:
-                if flag in self._arguments:
-                    self._arguments.remove(flag)
-
     def enable_mobile(
         self,
         android_package: Optional[str] = "com.android.chrome",

py/selenium/webdriver/chromium/options.py

@@ -33,6 +33,7 @@ def __init__(self) -> None:
         self._extensions: List[str] = []
         self._experimental_options: Dict[str, Union[str, int, dict, List[str]]] = {}
         self._debugger_address: Optional[str] = None
+        self._enable_webextensions: bool = False
 
     @property
     def binary_location(self) -> str:
@@ -126,6 +127,39 @@ def add_experimental_option(self, name: str, value: Union[str, int, dict, List[s
         """
         self._experimental_options[name] = value
 
+    @property
+    def enable_webextensions(self) -> bool:
+        """Returns whether webextension support is enabled for Chromium-based browsers.
+
+        :Returns: True if webextension support is enabled, False otherwise.
+        """
+        return self._enable_webextensions
+
+    @enable_webextensions.setter
+    def enable_webextensions(self, value: bool) -> None:
+        """Enables or disables webextension support for Chromium-based browsers.
+
+        When enabled, this automatically adds the required Chromium flags:
+        - --enable-unsafe-extension-debugging
+        - --remote-debugging-pipe
+
+        :Args:
+         - value: True to enable webextension support, False to disable.
+        """
+        self._enable_webextensions = value
+        if value:
+            # Add required flags for Chromium webextension support
+            required_flags = ["--enable-unsafe-extension-debugging", "--remote-debugging-pipe"]
+            for flag in required_flags:
+                if flag not in self._arguments:
+                    self.add_argument(flag)
+        else:
+            # Remove webextension flags if disabling
+            flags_to_remove = ["--enable-unsafe-extension-debugging", "--remote-debugging-pipe"]
+            for flag in flags_to_remove:
+                if flag in self._arguments:
+                    self._arguments.remove(flag)
+
     def to_capabilities(self) -> dict:
         """Creates a capabilities with all the options that have been set
         :Returns: A dictionary with everything."""

py/selenium/webdriver/common/bidi/webextension.py

@@ -62,7 +62,7 @@ def install(self, path=None, archive_path=None, base64_value=None) -> Dict:
         except WebDriverException as e:
             if "Method not available" in str(e):
                 raise WebDriverException(
-                    f"{str(e)}. If you are using Chrome, add '--enable-unsafe-extension-debugging' "
+                    f"{str(e)}. If you are using Chrome or Edge, add '--enable-unsafe-extension-debugging' "
                     "and '--remote-debugging-pipe' arguments or set options.enable_webextensions = True"
                 ) from e
             raise

py/test/selenium/webdriver/common/bidi_webextension_tests.py

@@ -60,11 +60,10 @@ def test_webextension_initialized(driver):
     assert driver.webextension is not None
 
 
-@pytest.mark.xfail_edge
 def test_install_extension_path(driver, pages):
     """Test installing an extension from a directory path.
 
-    Note: For Chrome, webextensions are enabled when BiDi is used from conftest.py for this test.
+    Note: For Chrome adn Edge, webextensions are enabled when BiDi is used from conftest.py for this test.
     You can also manually enable them using:
 
     from selenium.webdriver.chrome.options import Options
@@ -85,8 +84,8 @@ def test_install_extension_path(driver, pages):
     """
     path = os.path.join(extensions, EXTENSION_PATH)
 
-    if driver.capabilities["browserName"].lower() == "chrome":
-        # chrome does not uses extension id from manifest.json so we cannot assert the id
+    if driver.capabilities["browserName"].lower() in ["chrome", "microsoftedge"]:
+        # chrome/edge does not uses extension id from manifest.json so we cannot assert the id
         ext_info = driver.webextension.install(path=path)
     else:
         ext_info = install_extension(driver, path=path)