From b34763b5deeff79f1ee89e27e247d47911ba9f76 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 21 Sep 2023 11:19:08 +0200 Subject: [PATCH 1/2] Browser testing fixes --- scripts/Util.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/Util.py b/scripts/Util.py index 806d74a7502..de430fce8eb 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2661,13 +2661,14 @@ def __init__(self, current): # acceptInsecureCerts capability but it's only supported by latest Firefox releases. # profilepath = os.path.join(current.driver.getComponent().getSourceDir(), "scripts", "selenium", "firefox") - profile = webdriver.FirefoxProfile(profilepath) - self.driver = webdriver.Firefox(firefox_profile=profile) + options = webdriver.FirefoxOptions() + options.set_preference("profile", profilepath) + self.driver = webdriver.Firefox(options=options) elif driver == "Ie": # Make sure we start with a clean cache - capabilities = webdriver.DesiredCapabilities.INTERNETEXPLORER.copy() - capabilities["ie.ensureCleanSession"] = True - self.driver = webdriver.Ie(capabilities=capabilities) + options = webdriver.IeOptions() + options.ensure_clean_session = True + self.driver = webdriver.Ie(options=options) elif driver == "Safari" and int(port) > 0: self.driver = webdriver.Safari(port=int(port), reuse_service=True) else: From 96a65a50b94f1be776279b040c82eadff40211a6 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 21 Sep 2023 12:12:18 +0200 Subject: [PATCH 2/2] Safari fixes --- scripts/Util.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Util.py b/scripts/Util.py index de430fce8eb..e8e0aaec12b 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2670,7 +2670,8 @@ def __init__(self, current): options.ensure_clean_session = True self.driver = webdriver.Ie(options=options) elif driver == "Safari" and int(port) > 0: - self.driver = webdriver.Safari(port=int(port), reuse_service=True) + service = webdriver.SafariService(port=port, reuse_service=True) + self.driver = webdriver.Safari(service=service) else: self.driver = getattr(webdriver, driver)() except: