Skip to content

Commit e57112e

Browse files
committed
Merge pull request #255 from KidkArolis/improve-karma-conf
Improve karma conf
2 parents 96122dd + ed0b54b commit e57112e

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

karma.conf.js

+3-14
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ module.exports = function(config) {
1212
exclude: [],
1313

1414
preprocessors: {
15-
'specs/main.js': ['webpack']
15+
'specs/main.js': ['webpack', 'sourcemap']
1616
},
1717

1818
webpack: {
1919
cache: true,
20-
// TODO: figure out how to get source maps in here, none of this works
21-
//devtool: {
22-
//'inline-source-map': true,
23-
//inlineSourceMap: true
24-
//},
20+
devtool: 'inline-source-map',
2521
module: {
2622
loaders: [
2723
{test: /\.js$/, loader: 'jsx-loader'}
@@ -49,13 +45,6 @@ module.exports = function(config) {
4945

5046
captureTimeout: 60000,
5147

52-
singleRun: false,
53-
54-
plugins: [
55-
require("karma-mocha"),
56-
require("karma-chrome-launcher"),
57-
require("karma-firefox-launcher"),
58-
require("karma-webpack")
59-
]
48+
singleRun: false
6049
});
6150
};

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"karma-cli": "0.0.4",
3737
"karma-firefox-launcher": "0.1.3",
3838
"karma-mocha": "0.1.3",
39+
"karma-sourcemap-loader": "^0.2.0",
3940
"karma-webpack": "1.2.1",
4041
"mocha": "1.20.1",
4142
"react": ">=0.11.0",

0 commit comments

Comments
 (0)