diff --git a/.travis.yml b/.travis.yml index 68b59ab..3e3f58d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,15 @@ language: node_js node_js: - "4" -sudo: false +sudo: required +dist: trusty + +addons: + apt: + sources: + - google-chrome + packages: + - google-chrome-stable cache: directories: @@ -22,13 +30,13 @@ matrix: - env: EMBER_TRY_SCENARIO=ember-canary before_install: + - 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 + - npm install -g npm@^2 install: + - npm install -g bower - npm install - bower install diff --git a/testem.js b/testem.js index 26044b2..6256423 100644 --- a/testem.js +++ b/testem.js @@ -4,10 +4,9 @@ module.exports = { "test_page": "tests/index.html?hidepassed", "disable_watching": true, "launch_in_ci": [ - "PhantomJS" + "Chrome" ], "launch_in_dev": [ "PhantomJS", - "Chrome" ] }; diff --git a/testem.json b/testem.json deleted file mode 100644 index b697025..0000000 --- a/testem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "framework": "qunit", - "test_page": "tests/index.html?hidepassed", - "disable_watching": true, - "launch_in_ci": [ - "Chrome" - ], - "launch_in_dev": [ - "Chrome" - ] -}