diff --git a/.travis.yml b/.travis.yml index 00c58228..2ae6604e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,18 @@ language: node_js node_js: - "4" +before_install: + - curl -L -o google-chrome.deb https://s3.amazonaws.com/circle-downloads/google-chrome-stable_current_amd64_47.0.2526.73-1.deb + - sudo dpkg -i google-chrome.deb + - sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome + - rm google-chrome.deb + sudo: false cache: directories: - node_modules + - bower_components env: - EMBER_TRY_SCENARIO=default @@ -24,7 +31,6 @@ matrix: before_install: - npm config set spin false - npm install -g bower - - npm install phantomjs-prebuilt install: - npm install diff --git a/testem.js b/testem.js index 8c56a4a5..a752bf62 100644 --- a/testem.js +++ b/testem.js @@ -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: [ + 'google-chrome', + '~/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', + }, + }, };