Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Vincent Bechu
slapos
Commits
dfe3c471
Commit
dfe3c471
authored
Feb 06, 2017
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/jstestnode: add chromium
parent
21c263c6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
software/jstestnode/instance.cfg.in
software/jstestnode/instance.cfg.in
+9
-0
software/jstestnode/runTestSuite.in
software/jstestnode/runTestSuite.in
+4
-0
No files found.
software/jstestnode/instance.cfg.in
View file @
dfe3c471
...
...
@@ -47,6 +47,15 @@ prefsjs-path = $${directory:etc}/prefs.js
shell-path = ${dash:location}/bin/dash
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]
recipe = slapos.cookbook:xvfb
runner-path = $${directory:services}/xvfb
...
...
software/jstestnode/runTestSuite.in
View file @
dfe3c471
...
...
@@ -18,6 +18,7 @@ from selenium.webdriver.support import expected_conditions as EC
os.environ['PATH'] = '$${directory:bin}' + os.pathsep + os.environ['PATH']
FIREFOX_EXECUTABLE = '$${firefox-instance:executable}'
CHROME_EXECUTABLE = '$${chrome-instance:executable}'
BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
def main():
...
...
@@ -93,6 +94,9 @@ def main():
if args.target == 'firefox':
firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
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']:
# parameters for mobile emulators have different names then parameters for
# desktop OSes
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment