diff --git a/.travis.yml b/.travis.yml index e759590..a70c2e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,17 @@ --- language: node_js node_js: - - "0.12" + - "stable" -sudo: false +sudo: required +dist: trusty + +addons: + apt: + sources: + - google-chrome + packages: + - google-chrome-stable cache: directories: @@ -27,13 +35,14 @@ matrix: - env: EMBER_TRY_SCENARIO=ember-1.13 before_install: - - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" - "npm config set spin false" - - "npm install -g npm@^2" + - "npm install -g npm@^3" install: - npm install -g bower - - npm install + - npm install --no-optional - bower install script: diff --git a/testem.js b/testem.js index 26044b2..86e8f8f 100644 --- a/testem.js +++ b/testem.js @@ -4,7 +4,8 @@ module.exports = { "test_page": "tests/index.html?hidepassed", "disable_watching": true, "launch_in_ci": [ - "PhantomJS" + "PhantomJS", + "Chrome" ], "launch_in_dev": [ "PhantomJS", diff --git a/testem.json b/testem.json deleted file mode 100644 index 0f35392..0000000 --- a/testem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "framework": "qunit", - "test_page": "tests/index.html?hidepassed", - "disable_watching": true, - "launch_in_ci": [ - "PhantomJS" - ], - "launch_in_dev": [ - "PhantomJS", - "Chrome" - ] -}