Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remote browser without options 1855 #1856

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Remote browser without options 1855 #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b933ea3
Options need to be initialized for remote browsers
emanlove Sep 24, 2023
e6aff34
Initial atest for remote browsers without options
emanlove Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions atest/acceptance/remote_browsers.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
*** Settings ***
Library SeleniumLibrary
Library Process

*** Variables ***
${URL} https://robotframework.org/
${REMOTE_BETA} http://localhost:7272

*** Test Cases ***
Open Chrome with Remote Webdriver without Options
# [Setup] StartDriver chromedriver
Open Browser
... url=${URL}
... browser=chrome
... remote_url=${REMOTE_BETA}
# [Teardown] Stop Driver

Open Edge with Remote Webdriver without Options
# [Setup] StartDriver msedgedriver
Open Browser
... url=${URL}
... browser=edge
... remote_url=${REMOTE_BETA}
# [Teardown] Stop Driver

*** Keywords ***
Start Driver
[Arguments] ${driver_cmd}
Start Process ${driver_cmd} --port:7272
${result}= Wait For Process timeout=30secs
Process Should Be Running error_message=Unable to start driver with command ${driver_cmd}

Stop Driver
Terminate Process
44 changes: 14 additions & 30 deletions src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,9 @@ def create_chrome(
executable_path="chromedriver",
):
if remote_url:
defaul_caps = webdriver.DesiredCapabilities.CHROME.copy()
desired_capabilities = self._remote_capabilities_resolver(
desired_capabilities, defaul_caps
)
return self._remote(desired_capabilities, remote_url, options=options)
if not options:
options = webdriver.ChromeOptions()
return self._remote(remote_url, options=options)
if not executable_path:
executable_path = self._get_executable_path(webdriver.chrome.service.Service)
service = ChromeService(executable_path=executable_path, log_path=service_log_path)
Expand Down Expand Up @@ -196,11 +194,7 @@ def create_firefox(
# as to attach the profile to it. If there a scenario in which we don't want to do this???

if remote_url:
default_caps = webdriver.DesiredCapabilities.FIREFOX.copy()
desired_capabilities = self._remote_capabilities_resolver(
desired_capabilities, default_caps
)
return self._remote(desired_capabilities, remote_url, profile, options)
return self._remote(remote_url, options)
service_log_path = (
service_log_path if service_log_path else self._geckodriver_log
)
Expand All @@ -209,9 +203,7 @@ def create_firefox(
service = FirefoxService(executable_path=executable_path, log_path=service_log_path)
return webdriver.Firefox(
options=options,
#firefox_profile=profile, # need to move
service=service,
#**desired_capabilities,
)

def _get_ff_profile(self, ff_profile_dir):
Expand Down Expand Up @@ -271,11 +263,9 @@ def create_ie(
executable_path="IEDriverServer.exe",
):
if remote_url:
defaul_caps = webdriver.DesiredCapabilities.INTERNETEXPLORER.copy()
desired_capabilities = self._remote_capabilities_resolver(
desired_capabilities, defaul_caps
)
return self._remote(desired_capabilities, remote_url, options=options)
if not options:
options = webdriver.IeOptions()
return self._remote(remote_url, options=options)
if not executable_path:
executable_path = self._get_executable_path(webdriver.ie.service.Service)
service = IeService(executable_path=executable_path, log_path=service_log_path)
Expand All @@ -298,11 +288,9 @@ def create_edge(
executable_path="msedgedriver",
):
if remote_url:
defaul_caps = webdriver.DesiredCapabilities.EDGE.copy()
desired_capabilities = self._remote_capabilities_resolver(
desired_capabilities, defaul_caps
)
return self._remote(desired_capabilities, remote_url, options=options)
if not options:
options = webdriver.EdgeOptions()
return self._remote(remote_url, options=options)
if not executable_path:
executable_path = self._get_executable_path(webdriver.edge.service.Service)
service = EdgeService(executable_path=executable_path, log_path=service_log_path)
Expand All @@ -321,25 +309,21 @@ def create_safari(
executable_path="/usr/bin/safaridriver",
):
if remote_url:
defaul_caps = webdriver.DesiredCapabilities.SAFARI.copy()
desired_capabilities = self._remote_capabilities_resolver(
desired_capabilities, defaul_caps
)
return self._remote(desired_capabilities, remote_url, options=options)
if not options:
options = webdriver.SafariOptions()
return self._remote(remote_url, options=options)
if not executable_path:
executable_path = self._get_executable_path(webdriver.Safari)
service = SafariService(executable_path=executable_path, log_path=service_log_path)
return webdriver.Safari(options=options, service=service)

def _remote(self, desired_capabilities, remote_url, profile_dir=None, options=None):
def _remote(self, remote_url, options):
remote_url = str(remote_url)
file_detector = self._get_sl_file_detector()
return webdriver.Remote(
command_executor=remote_url,
# browser_profile=profile_dir,
options=options,
file_detector=file_detector,
# **desired_capabilities,
)

def _get_sl_file_detector(self):
Expand Down
Loading