Skip to content

Commit

Permalink
Upgrade Karma to 1.7.0 to pick up fix for karma-runner/karma#2582
Browse files Browse the repository at this point in the history
  • Loading branch information
Spencer Brown committed Jul 19, 2017
1 parent b2f0fc3 commit 4617422
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 25 deletions.
20 changes: 0 additions & 20 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,26 +133,6 @@ class Erik {
reporters: ['mocha'],
failOnEmptyTestSuite: false,

/**
* We must override the default `browserConsoleLogOptions` to allow `log`-type messages (ie
* those produced by `console.log`) to display in Erik's output among the tests as they run
* because Karma has a bug with its console message filtering.
* See https://github.com/karma-runner/karma-mocha/issues/47 and
* https://github.com/karma-runner/karma/issues/2582 for more details.
*/
browserConsoleLogOptions: {
// Override the default value, `debug`, here.
level: 'log',

/**
* Unrelated to Karma's bug, we override the default option here to skip outputting the
* browser because Erik only runs tests using PhantomJS so logging the browser name is
* unnecessary.
*/
format: '%T: %m',
terminal: true
},

/**
* Pass an empty object for `preprocessors` in order to disable Karma's default processing
* of coffescript files.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"gulp-concat": "^2.6.1",
"gulp-remote-src": "^0.4.2",
"jasmine-core": "^2.5.2",
"karma": "^1.5.0",
"karma": "^1.7.0",
"karma-jasmine": "^1.1.0",
"karma-mocha-reporter": "^2.2.2",
"karma-phantomjs-launcher": "^1.0.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1099,9 +1099,9 @@ karma-phantomjs-launcher@^1.0.2:
lodash "^4.0.1"
phantomjs-prebuilt "^2.1.7"

karma@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/karma/-/karma-1.5.0.tgz#9c4c14f0400bef2c04c8e8e6bff59371025cc009"
karma@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269"
dependencies:
bluebird "^3.3.0"
body-parser "^1.16.1"
Expand All @@ -1120,7 +1120,7 @@ karma@^1.5.0:
lodash "^3.8.0"
log4js "^0.6.31"
mime "^1.3.4"
minimatch "^3.0.0"
minimatch "^3.0.2"
optimist "^0.6.1"
qjobs "^1.1.4"
range-parser "^1.2.0"
Expand Down

0 comments on commit 4617422

Please sign in to comment.