Merge pull request #1253 from code-corps/update-travis

[CircleCI]: switch over to using Chrome on travis and FF and Chrome loc…

.travis.yml

@@ -1,24 +1,30 @@
----
 language: node_js
 node_js:
-  - "6"
+  - "7"
 
+dist: trusty
 sudo: false
 
+addons:
+  apt:
+    packages:
+      - google-chrome-stable
+
 cache:
-  directories:
-    - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
+  yarn: true
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile
+
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to star
 
 script:
-  - npm test
+  npm test

circle.yml

@@ -18,7 +18,6 @@ dependencies:
     - /home/ubuntu/nvm/versions/node/v6.9.4/lib/node_modules
   override:
     - yarn global add bower
-    - yarn global add phantomjs-prebuilt
     - yarn add node-sass
     - yarn install
     - bower install

testem.js

@@ -3,10 +3,10 @@ module.exports = {
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "Chrome"
   ],
   "launch_in_dev": [
-    "PhantomJS",
+    "Firefox",
     "Chrome"
   ]
 };