Added service argument to create browser methods

emanlove · May 5, 2024 · 1415f12 · 1415f12
1 parent 8d8fec0
commit 1415f12
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/atest/acceptance/1-plugin/OpenBrowserExample.py b/atest/acceptance/1-plugin/OpenBrowserExample.py
@@ -24,6 +24,7 @@ def open_browser(
         service_log_path=None,
         extra_dictionary=None,
         executable_path=None,
+        service=None,
     ):
         self._new_creator.extra_dictionary = extra_dictionary
         browser_manager = BrowserManagementKeywords(self.ctx)
@@ -37,7 +38,8 @@ def open_browser(
             ff_profile_dir=ff_profile_dir,
             options=options,
             service_log_path=service_log_path,
-            executable_path=None,
+            executable_path=executable_path,
+            service=service,
         )
 
     def _make_driver(
@@ -49,6 +51,7 @@ def _make_driver(
         options=None,
         service_log_path=None,
         executable_path=None,
+        service=None,
     ):
         driver = self._new_creator.create_driver(
             browser=browser,
@@ -58,6 +61,7 @@ def _make_driver(
             options=options,
             service_log_path=service_log_path,
             executable_path=executable_path,
+            service=None,
         )
         driver.set_script_timeout(self.ctx.timeout)
         driver.implicitly_wait(self.ctx.implicit_wait)
@@ -76,13 +80,15 @@ def create_driver(
         options=None,
         service_log_path=None,
         executable_path=None,
+        service=None,
     ):
         self.browser_names["seleniumwire"] = "seleniumwire"
         browser = self._normalise_browser_name(browser)
         creation_method = self._get_creator_method(browser)
         desired_capabilities = self._parse_capabilities(desired_capabilities, browser)
         service_log_path = self._get_log_path(service_log_path)
         options = self.selenium_options.create(self.browser_names.get(browser), options)
+        service = self.selenium_service.create(self.browser_names.get(browser), service)
         if service_log_path:
             logger.info("Browser driver log file created to: %s" % service_log_path)
             self._create_directory(service_log_path)
@@ -96,23 +102,26 @@ def create_driver(
                 profile_dir,
                 options=options,
                 service_log_path=service_log_path,
+                service=service,
             )
         if creation_method == self.create_seleniumwire:
             return creation_method(
                 desired_capabilities,
                 remote_url,
                 options=options,
                 service_log_path=service_log_path,
+                service=service,
             )
         return creation_method(
             desired_capabilities,
             remote_url,
             options=options,
             service_log_path=service_log_path,
+            service=service,
         )
 
     def create_seleniumwire(
-        self, desired_capabilities, remote_url, options=None, service_log_path=None
+        self, desired_capabilities, remote_url, options=None, service_log_path=None, service=None,
     ):
         logger.info(self.extra_dictionary)
         return webdriver.Chrome()