Skip to content

Commit e8e308c

Browse files
author
Todd Kloots
committed
Update karma config
1 parent 8902f32 commit e8e308c

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ language: node_js
22
node_js:
33
- "0.10"
44
before_script:
5-
- "export DISPLAY=:99.0"
6-
- "sh -e /etc/init.d/xvfb start"
5+
- export DISPLAY=:99.0
6+
- sh -e /etc/init.d/xvfb start

karma.conf.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ var webpack = require('webpack');
33
module.exports = function (config) {
44
config.set({
55

6+
browserNoActivityTimeout: 30000,
7+
68
browsers: [ process.env.CONTINUOUS_INTEGRATION ? 'Firefox' : 'Chrome' ],
79

810
singleRun: process.env.CONTINUOUS_INTEGRATION === 'true',
@@ -18,10 +20,10 @@ module.exports = function (config) {
1820
},
1921

2022
webpack: {
21-
devtool: 'eval',
23+
devtool: 'inline-source-map',
2224
module: {
2325
loaders: [
24-
{ test: /\.js$/, loader: 'jsx-loader?harmony' }
26+
{ test: /\.js$/, loader: 'babel-loader' }
2527
]
2628
},
2729
plugins: [

0 commit comments

Comments
 (0)