Switching Karma test browser to Chrome
Apparently traceurRuntime doesn't work in PhantomJS
This commit is contained in:
parent
257fb19369
commit
042228d09f
@ -56,7 +56,6 @@ gulp.task('compass', function() {
|
|||||||
|
|
||||||
gulp.task('browserify', function() {
|
gulp.task('browserify', function() {
|
||||||
var browserify = require('browserify'),
|
var browserify = require('browserify'),
|
||||||
es6ify = require('es6ify'),
|
|
||||||
exorcist = require('exorcist'),
|
exorcist = require('exorcist'),
|
||||||
tap = require('gulp-tap'),
|
tap = require('gulp-tap'),
|
||||||
transform = require('vinyl-transform');
|
transform = require('vinyl-transform');
|
||||||
|
@ -2,7 +2,11 @@ var _ = require('lodash'),
|
|||||||
config = require('./config');
|
config = require('./config');
|
||||||
|
|
||||||
module.exports = function(karma) {
|
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({
|
karma.set({
|
||||||
frameworks: ['browserify', 'jasmine'],
|
frameworks: ['browserify', 'jasmine'],
|
||||||
@ -14,7 +18,7 @@ module.exports = function(karma) {
|
|||||||
reporters: ['progress', 'notify'],
|
reporters: ['progress', 'notify'],
|
||||||
colors: true,
|
colors: true,
|
||||||
logLevel: karma.LOG_INFO,
|
logLevel: karma.LOG_INFO,
|
||||||
browsers: ['PhantomJS'],
|
browsers: ['Chrome'],
|
||||||
autoWatch: true,
|
autoWatch: true,
|
||||||
singleRun: false,
|
singleRun: false,
|
||||||
browserify: config.browserify
|
browserify: config.browserify
|
||||||
|
@ -24,9 +24,9 @@
|
|||||||
"gulp-wrap": "^0.5.0",
|
"gulp-wrap": "^0.5.0",
|
||||||
"karma": "^0.12.25",
|
"karma": "^0.12.25",
|
||||||
"karma-browserify": "^1.0.0",
|
"karma-browserify": "^1.0.0",
|
||||||
|
"karma-chrome-launcher": "^0.1.7",
|
||||||
"karma-jasmine": "^0.3.1",
|
"karma-jasmine": "^0.3.1",
|
||||||
"karma-notify-reporter": "^0.1.1",
|
"karma-notify-reporter": "^0.1.1",
|
||||||
"karma-phantomjs-launcher": "^0.1.4",
|
|
||||||
"lodash": "^2.4.1",
|
"lodash": "^2.4.1",
|
||||||
"q": "^1.1.2",
|
"q": "^1.1.2",
|
||||||
"snapsvg": "git://github.com/adobe-webplatform/Snap.svg#dev",
|
"snapsvg": "git://github.com/adobe-webplatform/Snap.svg#dev",
|
||||||
|
Loading…
Reference in New Issue
Block a user