From 4e31eaf766f358ae3be3ca492cf4c85144d287c6 Mon Sep 17 00:00:00 2001
From: Kevin Hill <kevinkhill@gmail.com>
Date: Mon, 27 Apr 2015 18:42:22 -0700
Subject: [PATCH] travis karma test

---
 .travis.yml           | 17 +++++++++++++++--
 configs/karma.conf.js |  2 +-
 package.json          |  4 ++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index af6f8bab..a2366a1a 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,16 +18,29 @@ branches:
 
 email: kevinkhill@gmail.com
 
+cache:
+  directories:
+    - vendor
+    - node_modules
+
+before_install:
+  - npm config set spin false
+
+install:
+  - npm install
+
 before_script:
   - echo 'date.timezone = "America/Los_Angeles"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - mkdir -p build/logs
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
   - composer install --no-progress
   - npm install
 
 script:
-  - php -i | grep timezone
+  #- php -i | grep timezone
   - phpunit -c configs/phpunit.xml.dist
-  - gulp test
+  - npm test
 
 after_script:
   - php vendor/bin/coveralls
diff --git a/configs/karma.conf.js b/configs/karma.conf.js
index b60d9dc4..2cfc86c9 100644
--- a/configs/karma.conf.js
+++ b/configs/karma.conf.js
@@ -56,7 +56,7 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS', 'Chrome'],
+    browsers: ['Firefox', 'Chrome'],
 
 
     // Continuous Integration mode
diff --git a/package.json b/package.json
index 7e26c974..0dd0a2d9 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "jasmine-core": "^2.2.0",
     "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.8",
+    "karma-firefox-launcher": "^0.1.4",
     "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "^0.1.4",
     "sh": "0.0.3",
@@ -26,5 +27,8 @@
   },
   "bugs": {
     "url": "https://github.com/kevinkhill/lavacharts/issues"
+  },
+  "scripts": {
+    "test": "./node_modules/.bin/karma start --browsers Firefox --single-run"
   }
 }