WdspecExecutor should set capabilities from the ExecutorBrowser

This makes it match what executorwebdriver.WebDriverProtocol does.

Author: gsnedders

tools/wptrunner/wptrunner/executors/base.py

@@ -17,7 +17,7 @@
 from . import pytestrunner
 from .actions import actions
 from .asyncactions import async_actions
-from .protocol import Protocol, WdspecProtocol
+from .protocol import Protocol, WdspecProtocol, merge_dicts
 
 
 here = os.path.dirname(__file__)
@@ -687,6 +687,25 @@ def __init__(self, logger, browser, server_config, webdriver_binary,
         os_map = {"win": "windows"}
         self.target_platform = os_map.get(target_platform, target_platform)
 
+        # See also: executorwebdriver.py
+        if hasattr(browser, "capabilities"):
+            if self.capabilities is None:
+                self.capabilities = browser.capabilities
+            else:
+                merge_dicts(self.capabilities, browser.capabilities)
+
+        pac = browser.pac
+        if pac is not None:
+            if self.capabilities is None:
+                self.capabilities = {}
+            merge_dicts(self.capabilities, {"proxy":
+                {
+                    "proxyType": "pac",
+                    "proxyAutoconfigUrl": urljoin(self.server_url("http"), pac)
+                }
+            })
+
+
     def setup(self, runner, protocol=None):
         assert protocol is None, "Switch executor not allowed for wdspec tests."
         self.protocol = self.protocol_cls(self, self.browser)