diff --git a/.travis.yml b/.travis.yml index 43afdf594..b8ef4037a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,23 +4,20 @@ node_js: - "6" sudo: false +dist: trusty + +addons: + chrome: stable cache: - directories: - - node_modules - - $HOME/.yarn-cache + yarn: true before_install: - - npm config set spin false - - npm install -g yarn - -install: - - yarn - - npm install phantomjs-prebuilt - - node_modules/phantomjs-prebuilt/bin/phantomjs --version + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 + - export PATH=$HOME/.yarn/bin:$PATH script: - - npm run test:ci + - yarn test:ci env: - SAUCE_USERNAME=mobiledoc-kit SAUCE_ACCESS_KEY=f9cad21d-1141-452d-8f64-c6ba3f43faa6 diff --git a/testem-ci.json b/testem-ci.json index 1f5175ea3..e73345639 100644 --- a/testem-ci.json +++ b/testem-ci.json @@ -36,15 +36,19 @@ } }, "launch_in_ci": [ - "PhantomJS", + "Chrome", "SL_Firefox_Current", "SL_Chrome_Current", "SL_Safari_Current", "SL_MS_Edge", "SL_IE_11" ], - "launch_in_dev": [ - "PhantomJS", - "Chrome" - ] + "browser_args": { + "Chrome": [ + "--disable-gpu", + "--headless", + "--remote-debugging-port=9222", + "--window-size=1440,900" + ] + } } diff --git a/testem.json b/testem.json index bc3cf72e7..8c08685d5 100644 --- a/testem.json +++ b/testem.json @@ -1,15 +1,19 @@ { "framework": "qunit", - "test_page": "dist/tests/index.html", + "test_page": "dist/tests/index.html?hidepassed", "src_files": [ "tests/**/*.js", "src/**/*.js" ], - "launch_in_ci": [ - "PhantomJS" - ], "launch_in_dev": [ - "PhantomJS", "Chrome" - ] + ], + "browser_args": { + "Chrome": [ + "--disable-gpu", + "--headless", + "--remote-debugging-port=9222", + "--window-size=1440,900" + ] + } }