Skip to content

Commit

Permalink
format karma config
Browse files Browse the repository at this point in the history
  • Loading branch information
Michał Sajnóg committed Jun 18, 2016
1 parent fb6f2fc commit 984cc6e
Showing 1 changed file with 13 additions and 17 deletions.
30 changes: 13 additions & 17 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Karma configuration
// Generated on Mon Oct 19 2015 01:12:15 GMT+0200 (CEST)
var isTravis = process.env.TRAVIS || false;
var browsers = isTravis ? [ 'Chrome_travis_ci' ] : ['Chrome'];
var browsers = isTravis ? ['Chrome_travis_ci'] : ['Chrome'];
var singleRun = isTravis;

module.exports = function(config) {
Expand All @@ -11,8 +11,7 @@ module.exports = function(config) {
frameworks: ['jasmine-jquery', 'jasmine'],

files: [
'test/index.js',
{
'test/index.js', {
pattern: 'test/fixtures/**/*.html',
watched: true,
included: false,
Expand All @@ -21,23 +20,20 @@ module.exports = function(config) {
],

preprocessors: {
'test/index.js': [ 'webpack' ]
'test/index.js': ['webpack']
},

webpack: {
devtool: 'inline-source-map',
module: {
loaders: [
{
test: /\.js?$/,
exclude: [/bower_components/, /node_modules/],
loader: 'babel'
},
{
test: /\.scss$/,
loader: "css-loader?sourceMap!sass-loader"
}
]
loaders: [{
test: /\.js?$/,
exclude: [/bower_components/, /node_modules/],
loader: 'babel'
}, {
test: /\.scss$/,
loader: "css-loader?sourceMap!sass-loader"
}]
}
},

Expand All @@ -52,8 +48,8 @@ module.exports = function(config) {

customLaunchers: {
Chrome_travis_ci: {
base: 'Chrome',
flags: ['--no-sandbox']
base: 'Chrome',
flags: ['--no-sandbox']
}
},

Expand Down

0 comments on commit 984cc6e

Please sign in to comment.