Skip to content

don't pass service_args when creating browser unless it's accepted by we... #6

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

Merged
hellmanj merged 1 commit into from
Dec 8, 2014
Merged

don't pass service_args when creating browser unless it's accepted by we... #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions robotpageobjects/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,10 +757,13 @@ def go_to(self, *args):
def _generic_make_browser(self, webdriver_type, desired_cap_type, remote_url, desired_caps):
"""Override Selenium2Library's _generic_make_browser to allow for extra params
to driver constructor."""
kwargs = {}
if not remote_url:
browser = webdriver_type(service_args=self.service_args)
if 'service_args' in inspect.getargspec(webdriver_type.__init__).args:
kwargs['service_args'] = self.service_args
browser = webdriver_type(**kwargs)
else:
browser = self._create_remote_web_driver(desired_cap_type,remote_url , desired_caps)
browser = self._create_remote_web_driver(desired_cap_type, remote_url, desired_caps)
return browser

def _make_browser(self, browser_name, desired_capabilities=None, profile_dir=None, remote=None):
Expand Down