Merge branch 'Byron-travis-ci'

This commit is contained in:
Jeff Avallone
2016-07-27 11:15:53 -04:00
3 changed files with 15 additions and 2 deletions
+6
View File
@@ -0,0 +1,6 @@
language: node_js
node_js:
- "4.1"
before_script:
- npm install -g gulp
script: gulp verify
+8 -2
View File
@@ -5,7 +5,13 @@ module.exports = function(karma) {
var globs = _.flatten([
config.globs.js,
config.globs.spec
]);
]),
browser = 'Chrome';
if (process.env.TRAVIS) {
globs.unshift('node_modules/babel-polyfill/dist/polyfill.js');
browser = 'PhantomJS';
}
karma.set({
frameworks: ['browserify', 'jasmine'],
@@ -17,7 +23,7 @@ module.exports = function(karma) {
reporters: ['progress', 'notify'],
colors: true,
logLevel: karma.LOG_INFO,
browsers: ['Chrome'],
browsers: [browser],
autoWatch: true,
singleRun: false,
browserify: _.extend({
+1
View File
@@ -36,6 +36,7 @@
"karma-chrome-launcher": "^0.2.2",
"karma-jasmine": "^0.3.1",
"karma-notify-reporter": "^0.1.1",
"karma-phantomjs-launcher": "^0.2.2",
"lodash": "^4.6.1",
"node-bourbon": "^4.2.3",
"snapsvg": "^0.4.0",