[py] cleanup options classes

SeleniumHQ · Aug 2, 2019 · f7b9b9e · f7b9b9e
1 parent d0198ec
commit f7b9b9e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/py/selenium/webdriver/chrome/options.py b/py/selenium/webdriver/chrome/options.py
@@ -20,15 +20,7 @@
 
 
 class Options(ChromiumOptions):
-    KEY = "goog:chromeOptions"
 
     @property
     def default_capabilities(self):
         return DesiredCapabilities.CHROME.copy()
-
-    def to_capabilities(self):
-        """
-        Creates a capabilities with all the options that have been set and
-        :Returns: A dictionary with everything
-        """
-        return super(Options, self).to_capabilities(self.KEY)
diff --git a/py/selenium/webdriver/chromium/options.py b/py/selenium/webdriver/chromium/options.py
@@ -18,10 +18,12 @@
 import base64
 import os
 
+from selenium.webdriver import DesiredCapabilities
 from selenium.webdriver.common.options import ArgOptions
 
 
 class ChromiumOptions(ArgOptions):
+    KEY = "goog:chromeOptions"
 
     def __init__(self):
         super(ChromiumOptions, self).__init__()
@@ -145,7 +147,7 @@ def headless(self, value):
         else:
             self._arguments = list(set(self._arguments) - args)
 
-    def to_capabilities(self, capabilityKey):
+    def to_capabilities(self):
         """
         Creates a capabilities with all the options that have been set
         :Returns: A dictionary with everything
@@ -159,10 +161,10 @@ def to_capabilities(self, capabilityKey):
         if self.debugger_address:
             chrome_options["debuggerAddress"] = self.debugger_address
 
-        caps[capabilityKey] = chrome_options
+        caps[self.KEY] = chrome_options
 
         return caps
 
     @property
     def default_capabilities(self):
-        pass
+        return DesiredCapabilities.CHROME.copy()
diff --git a/py/selenium/webdriver/edge/options.py b/py/selenium/webdriver/edge/options.py
@@ -20,7 +20,6 @@
 
 
 class Options(ChromiumOptions):
-    KEY = "goog:chromeOptions"
 
     def __init__(self, is_legacy=True):
         super(Options, self).__init__()
@@ -51,7 +50,7 @@ def to_capabilities(self):
         :Returns: A dictionary with everything
         """
         if not self._is_legacy:
-            return super(Options, self).to_capabilities(self.KEY)
+            return super(Options, self).to_capabilities()
 
         caps = self._caps
         caps['pageLoadStrategy'] = self._page_load_strategy