Skip to content

Commit

Permalink
Merge pull request #171 from yapplabs/chore/use-chrome-in-ci
Browse files Browse the repository at this point in the history
Use Chrome in CI.
  • Loading branch information
andrewhavens authored Apr 4, 2017
2 parents 976d43e + b6cad43 commit 12053ca
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
16 changes: 13 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,26 @@ language: node_js
node_js:
- "4"

sudo: false
dist: trusty
sudo: required

addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable

cache:
directories:
- node_modules

before_install:
- npm config set spin false
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "npm config set spin false"
- sleep 3
- npm install -g bower
- npm install phantomjs-prebuilt

install:
- npm install
Expand Down
3 changes: 1 addition & 2 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
};
12 changes: 0 additions & 12 deletions testem.json

This file was deleted.

0 comments on commit 12053ca

Please sign in to comment.