Merge pull request #245 from benjaminapetersen/drop-phantom

Drop PhantomJS from Gruntfile, allow Chrome/Firefox from karma.conf.js

.travis.yml

@@ -5,7 +5,12 @@ cache:
   directories:
   - node_modules
   - bower_components
+addons:
+  chrome: stable
 before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 5 # give xvfb some time to start
   - make build
 script:
   - hack/test-headless.sh test

Gruntfile.js

@@ -61,8 +61,7 @@ module.exports = function (grunt) {
       karma: {
         unit: {
           configFile: 'test/karma.conf.js',
-          singleRun: true,
-          browsers: ['PhantomJS']
+          singleRun: true
         }
       },
       less: {

package.json

@@ -29,9 +29,9 @@
     "grunt-ng-annotate": "^1.0.1",
     "grunt-remove": "^0.1.0",
     "karma": "0.12.23",
-    "karma-chrome-launcher": "0.1.4",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "0.1.3",
+    "karma-firefox-launcher": "^1.0.1",
     "karma-jasmine": "0.2.2",
     "karma-junit-reporter": "0.2.2",
     "karma-ng-html2js-preprocessor": "~0.1",

test/karma.conf.js

@@ -77,7 +77,7 @@ module.exports = function(config) {
     // - PhantomJS
     // - IE (only Windows)
     // CLI --browsers Chrome,Firefox,Safari
-    browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'],
+    browsers: [process.env.TRAVIS ? 'Chrome' : 'Chrome'],
 
     // If browser does not capture in given timeout [ms], kill it
     // CLI --capture-timeout 5000