From 042228d09fd79e73af371ead34585e78036b5f0e Mon Sep 17 00:00:00 2001 From: Jeff Avallone Date: Thu, 4 Dec 2014 19:11:30 -0500 Subject: [PATCH] Switching Karma test browser to Chrome Apparently traceurRuntime doesn't work in PhantomJS --- gulpfile.js | 1 - karma.conf.js | 8 ++++++-- package.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index cbdb81e..a47cdc3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -56,7 +56,6 @@ gulp.task('compass', function() { gulp.task('browserify', function() { var browserify = require('browserify'), - es6ify = require('es6ify'), exorcist = require('exorcist'), tap = require('gulp-tap'), transform = require('vinyl-transform'); diff --git a/karma.conf.js b/karma.conf.js index 80f2e43..6169175 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -2,7 +2,11 @@ var _ = require('lodash'), config = require('./config'); module.exports = function(karma) { - var globs = _.flatten([config.globs.js, config.globs.spec]); + var globs = _.flatten([ + require('es6ify').runtime, // Hack to get traceurRuntime in the build + config.globs.js, + config.globs.spec + ]); karma.set({ frameworks: ['browserify', 'jasmine'], @@ -14,7 +18,7 @@ module.exports = function(karma) { reporters: ['progress', 'notify'], colors: true, logLevel: karma.LOG_INFO, - browsers: ['PhantomJS'], + browsers: ['Chrome'], autoWatch: true, singleRun: false, browserify: config.browserify diff --git a/package.json b/package.json index 1cd4943..dbb8fe8 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "gulp-wrap": "^0.5.0", "karma": "^0.12.25", "karma-browserify": "^1.0.0", + "karma-chrome-launcher": "^0.1.7", "karma-jasmine": "^0.3.1", "karma-notify-reporter": "^0.1.1", - "karma-phantomjs-launcher": "^0.1.4", "lodash": "^2.4.1", "q": "^1.1.2", "snapsvg": "git://github.com/adobe-webplatform/Snap.svg#dev",