Skip to content

Commit

Permalink
fix(testing): Updated webpack config for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon Roberts committed Mar 30, 2016
1 parent 5cb0997 commit 00efe4c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = function(karma) {
exclude: [],

preprocessors: {
'tests.js': ['webpack']
'tests.js': ['webpack', 'sourcemap']
},

reporters: ['progress'],
Expand All @@ -32,13 +32,14 @@ module.exports = function(karma) {

webpack: {
resolve: {
root: __dirname
root: __dirname,
extensions: ['', '.ts', '.js']
},
module: {
loaders: [
{
test: /\.spec\.ts?$/,
exclude: /node_modules/,
test: /\.ts?$/,
exclude: /(node_modules)/,
loader: 'ts-loader'
}
]
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.3",
"karma-jasmine": "^0.3.8",
"karma-sourcemap-loader": "^0.3.7",
"karma-typescript-preprocessor": "0.0.21",
"karma-webpack": "^1.7.0",
"merge2": "^1.0.0",
Expand All @@ -36,7 +37,8 @@
"ts-loader": "^0.8.1",
"typescript": "^1.8.9",
"typings": "^0.7.9",
"webpack": "^1.12.14"
"webpack": "^1.12.14",
"zone.js": "^0.6.8"
},
"babel": {
"presets": [
Expand Down

0 comments on commit 00efe4c

Please sign in to comment.