aboutsummaryrefslogtreecommitdiff
path: root/karma.conf.js
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2018-05-01 13:51:07 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2018-05-01 13:51:07 +0900
commit4d7c24f38a6861e1d498b6e7dd5c7be2d1a0ad15 (patch)
tree0948f730a25eeda127c56a0f01009f14d066e4dc /karma.conf.js
parent177940981ed9c4f096ad7db20f0b7ee044fd7b17 (diff)
parentfb8a0f36aa4d070df936cc7598ef8dd988ee1b15 (diff)
Merge remote-tracking branch 'origin/master' into background-adjacent-tabs
Diffstat (limited to 'karma.conf.js')
-rw-r--r--karma.conf.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/karma.conf.js b/karma.conf.js
index 859cee0..46a1774 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -7,11 +7,13 @@ module.exports = function (config) {
frameworks: ['mocha'],
files: [
'test/**/*.test.js',
+ 'test/**/*.test.jsx',
'test/**/*.html'
],
preprocessors: {
'test/**/*.test.js': [ 'webpack' ],
+ 'test/**/*.test.jsx': [ 'webpack' ],
'test/**/*.html': ['html2js']
},