Skip to content

Commit

Permalink
Continue of npm-test
Browse files Browse the repository at this point in the history
  • Loading branch information
dyuvzhenko committed Nov 12, 2017
1 parent 5677c25 commit f622243
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
"license": "MIT",
"scripts": {
"start": "grunt",
"test": "grunt test",
"test": "rm -rf temp && webpack --config webpack/config.js && karma start test/config/karma.conf.js",
"dev": "concurrently --kill-others --raw \"grunt server\" \"grunt test\"",
"build": "grunt build",
"webpack-test": "webpack --config webpack/config.js && karma start test/config/karma.conf.js"
"build": "grunt build"
},
"devDependencies": {
"babel-core": "^6.22.1",
Expand Down
12 changes: 4 additions & 8 deletions test/config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ module.exports = function (config) {
files: require('./karma.conf.files.js').defaultFiles,


// add webpack as preprocessor
preprocessors: { 'test/*Spec.js': ['webpack'] },


// webpack configuration
webpack: require('../../webpack/config.js'),
webpack: require('../../webpack.config.js').config,


// webpack-dev-middleware configuration
Expand Down Expand Up @@ -51,10 +47,10 @@ module.exports = function (config) {


// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,
autoWatch: true,


keepalive: false,
keepalive: true,


// Start these browsers, currently available:
Expand All @@ -80,6 +76,6 @@ module.exports = function (config) {

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: true
singleRun: false
});
};

0 comments on commit f622243

Please sign in to comment.