Merge pull request #82 from angular-ui/chore-travis-allow-chrome-testing

chore(travis): allow chrome testing

Author: douglasduteil

.travis.yml

@@ -1,20 +1,20 @@
 ---
+git:
+  depth: 1
 language: node_js
 node_js:
 - '0.10'
-git:
-  depth: 10
 before_install:
+- export CHROME_BIN=chromium-browser
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
+- npm update -g
+before_script:
 - npm install -qg bower grunt-cli
-- npm install -q
-- bower install --force
-- bower install --force
+- bower install
 after_success:
 - "./node_modules/angular-ui-publisher/travis/authentication.sh || exit 0"
 - "grunt dist build:gh-pages publish:gh-pages build:bower publish:bower"
-script: grunt
 env:
   global:
   - REPO="[email protected]:angular-ui/ui-ace.git"

gruntFile.js

@@ -27,14 +27,6 @@ module.exports = function (grunt) {
 
   grunt.registerTask('build', fakeTargetTask('build'));
   grunt.registerTask('publish', fakeTargetTask('publish'));
-  //
-
-
-  var testConfig = function (configFile, customOptions) {
-    var options = { configFile: configFile, singleRun: true };
-    var travisOptions = process.env.TRAVIS && { browsers: [ 'Firefox', 'PhantomJS'], reporters: ['dots'] };
-    return grunt.util._.extend(options, customOptions, travisOptions);
-  };
 
   // Project configuration.
   grunt.initConfig({
@@ -69,7 +61,7 @@ module.exports = function (grunt) {
     },
 
     karma: {
-      unit: testConfig('test/karma.conf.js'),
+      unit: {configFile: 'test/karma.conf.js', singleRun: true},
       coverage : {
         configFile: 'test/karma.conf.js',
         reporters: ['progress', 'coverage'],

test/karma.conf.js

@@ -69,4 +69,17 @@ module.exports = function(config) {
     // if true, it capture browsers, run tests and exit
     singleRun: false
   });
+
+
+  if(process.env.TRAVIS){
+    config.set({
+      browsers: ['TravisCI_Chrome', 'Firefox', 'PhantomJS'],
+      customLaunchers: {
+        TravisCI_Chrome: {
+          base: 'Chrome',
+          flags: ['--no-sandbox']
+        }
+      }
+    });
+  }
 };