gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1652 from vector-im/rav/fix_karma_olm_warning 

Karma: fix warning by ignoring olm
This commit is contained in:
David Baker 2016-06-16 11:16:00 +01:00 committed by GitHub
parent 4cfcdfa040 795986f146
commit 42b7410a5d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
karma.conf.js
View File

@ -36,7 +36,7 @@ module.exports = function (config) {
proxies: { proxies: {
"/img/": "/base/vector/img/", "/img/": "/base/vector/img/",
}, },
// preprocess matching files before serving them to the browser // preprocess matching files before serving them to the browser
// available preprocessors: // available preprocessors:
// https://npmjs.org/browse/keyword/karma-preprocessor // https://npmjs.org/browse/keyword/karma-preprocessor
@ -123,7 +123,7 @@ module.exports = function (config) {
// same goes for js-sdk // same goes for js-sdk
"matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
sinon: 'sinon/pkg/sinon.js', sinon: 'sinon/pkg/sinon.js',
}, },
root: [ root: [
@ -131,6 +131,11 @@ module.exports = function (config) {
path.resolve('./test'), path.resolve('./test'),
], ],
}, },
plugins: [
// olm may not be installed, so avoid webpack warnings by
// ignoring it.
new webpack.IgnorePlugin(/^olm$/),
],
devtool: 'inline-source-map', devtool: 'inline-source-map',
}, },
}); });