Skip to content

Commit

Permalink
UI: config option to specify firefox/chromedriver/IEDriverServer bina…
Browse files Browse the repository at this point in the history
…ry location

(Issue SatelliteQE#3021)
  • Loading branch information
lpramuk committed Nov 18, 2015
1 parent 54c1c9e commit c2d4d8e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
3 changes: 3 additions & 0 deletions robottelo.properties.sample
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ ssh_key=
# verbosity=debug
# Selenium webdriver to use
# webdriver=firefox
# Binary location for selected wedriver
# webdriver_binary=/usr/bin/firefox
# webdriver_binary=/usr/bin/chromedriver
# cdn=true
# Run one datapoint or multiple datapoints for tests
# run_one_datapoint=false
Expand Down
3 changes: 3 additions & 0 deletions robottelo/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ def __init__(self):
self.verbosity = None
self.virtual_display = None
self.webdriver = None
self.webdriver_binary = None
self.window_manager_command = None

# Features
Expand Down Expand Up @@ -540,6 +541,8 @@ def _read_robottelo_settings(self):
'robottelo', 'virtual_display', False, bool)
self.webdriver = self.reader.get(
'robottelo', 'webdriver', 'firefox')
self.webdriver_binary = self.reader.get(
'robottelo', 'webdriver_binary', None)
self.window_manager_command = self.reader.get(
'robottelo', 'window_manager_command', None)

Expand Down
16 changes: 13 additions & 3 deletions robottelo/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def setUpClass(cls): # noqa
cls.katello_user = settings.server.admin_username
cls.katello_passwd = settings.server.admin_password
cls.driver_name = settings.webdriver
cls.driver_binary = settings.webdriver_binary
cls.locale = settings.locale
cls.server_name = settings.server.hostname
cls.screenshots_dir = settings.screenshots_path
Expand Down Expand Up @@ -170,11 +171,20 @@ def setUpClass(cls): # noqa
def setUp(self): # noqa
"""We do want a new browser instance for every test."""
if self.driver_name.lower() == 'firefox':
self.browser = webdriver.Firefox()
self.browser = webdriver.Firefox(
firefox_binary=webdriver.firefox.firefox_binary.FirefoxBinary(
self.driver_binary)
)
elif self.driver_name.lower() == 'chrome':
self.browser = webdriver.Chrome()
self.browser = (
webdriver.Chrome() if self.driver_binary is None
else webdriver.Chrome(executable_path=self.driver_binary)
)
elif self.driver_name.lower() == 'ie':
self.browser = webdriver.Ie()
self.browser = (
webdriver.Ie() if self.driver_binary is None
else webdriver.Ie(executable_path=self.driver_binary)
)
elif self.driver_name.lower() == 'phantomjs':
service_args = ['--ignore-ssl-errors=true']
self.browser = webdriver.PhantomJS(
Expand Down

0 comments on commit c2d4d8e

Please sign in to comment.