Commit dfe3c471 authored by Vincent Bechu's avatar Vincent Bechu

software/jstestnode: add chromium

parent 21c263c6
...@@ -47,6 +47,15 @@ prefsjs-path = $${directory:etc}/prefs.js ...@@ -47,6 +47,15 @@ prefsjs-path = $${directory:etc}/prefs.js
shell-path = ${dash:location}/bin/dash shell-path = ${dash:location}/bin/dash
tmp-path = $${xvfb-instance:tmp-path} tmp-path = $${xvfb-instance:tmp-path}
[chrome-instance]
recipe = slapos.cookbook:chromium
executable = firefox
runner-path = $${directory:bin}/$${:executable}
firefox-path = ${firefox:location}/chrome-slapos
prefsjs-path = $${directory:etc}/prefs.js
shell-path = ${dash:location}/bin/dash
tmp-path = $${xvfb-instance:tmp-path}
[xvfb-instance] [xvfb-instance]
recipe = slapos.cookbook:xvfb recipe = slapos.cookbook:xvfb
runner-path = $${directory:services}/xvfb runner-path = $${directory:services}/xvfb
......
...@@ -18,6 +18,7 @@ from selenium.webdriver.support import expected_conditions as EC ...@@ -18,6 +18,7 @@ from selenium.webdriver.support import expected_conditions as EC
os.environ['PATH'] = '$${directory:bin}' + os.pathsep + os.environ['PATH'] os.environ['PATH'] = '$${directory:bin}' + os.pathsep + os.environ['PATH']
FIREFOX_EXECUTABLE = '$${firefox-instance:executable}' FIREFOX_EXECUTABLE = '$${firefox-instance:executable}'
CHROME_EXECUTABLE = '$${chrome-instance:executable}'
BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/' BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
def main(): def main():
...@@ -93,6 +94,9 @@ def main(): ...@@ -93,6 +94,9 @@ def main():
if args.target == 'firefox': if args.target == 'firefox':
firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE) firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
browser = webdriver.Firefox(firefox_binary=firefox_binary) browser = webdriver.Firefox(firefox_binary=firefox_binary)
elif args.target == 'chromium':
chrome_binary = webdriver.chrome.chrome_binary.FirefoxBinary(chrome_path=CHROME_EXECUTABLE)
browser = webdriver.Chrome()
elif args.target in ['iOS', 'Android']: elif args.target in ['iOS', 'Android']:
# parameters for mobile emulators have different names then parameters for # parameters for mobile emulators have different names then parameters for
# desktop OSes # desktop OSes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment