Skip to content

Commit

Permalink
[testing] Use Chrome, not PhantomJS
Browse files Browse the repository at this point in the history
  • Loading branch information
Arjan Singh committed Aug 15, 2016
1 parent 8ba5eb6 commit 055d419
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 3 deletions.
16 changes: 14 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,24 @@ language: node_js
node_js:
- "4"

sudo: false
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm config set spin false
- npm install -g bower
- bower --version
- npm install phantomjs-prebuilt
- phantomjs --version

sudo: required

dist: trusty

cache:
directories:
- node_modules
- bower_components

env:
- EMBER_TRY_SCENARIO=default
Expand All @@ -24,7 +37,6 @@ matrix:
before_install:
- npm config set spin false
- npm install -g bower
- npm install phantomjs-prebuilt

install:
- npm install
Expand Down
29 changes: 28 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,32 @@ module.exports = {
"launch_in_dev": [
"PhantomJS",
"Chrome"
]
],
launch_in_ci: [
'Chrome Custom',
],
launch_in_dev: [
'Chrome Custom',
],
launchers: {
'Chrome Custom': {
exe: [
'chromiunm-browser',
'~/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
'/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
],
args: [
'--user-data-dir=/tmp/testem.chrome.custom',
'--no-default-browser-check',
'--no-first-run',
'--ignore-certificate-errors',
'--test-type',
'--disable-extensions',
'--disable-web-security',
'--disable-renderer-backgrounding',
'--disable-background-timer-throttling',
],
protocol: 'browser',
},
},
};

0 comments on commit 055d419

Please sign in to comment.