Skip to content

Commit

Permalink
Merge pull request #4 from wheresrhys/DRYer-Blob
Browse files Browse the repository at this point in the history
added chrome tests
  • Loading branch information
wheresrhys committed May 4, 2015
2 parents aa54467 + 598c0cc commit 2de3af6
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ module.exports = function(karma) {
},
browsers: ['PhantomJS', 'Chrome'],
customLaunchers: {
Chrome_travis_ci: {
base: 'Chrome',
flags: ['--no-sandbox']
}
}
Chrome_travis_ci: {
base: 'Chrome',
flags: ['--no-sandbox']
}
}
};

if(process.env.TRAVIS){
configuration.browsers = ['PhantomJS', 'Chrome_travis_ci'];
}
if(process.env.TRAVIS){
configuration.browsers = ['PhantomJS', 'Chrome_travis_ci'];
}

karma.set(configuration);
karma.set(configuration);

};

0 comments on commit 2de3af6

Please sign in to comment.