Skip to content

Commit

Permalink
Upgrade to eslint@4.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
scottohara committed Nov 27, 2017
1 parent b2f11b2 commit 36a87bb
Show file tree
Hide file tree
Showing 27 changed files with 676 additions and 598 deletions.
26 changes: 17 additions & 9 deletions karma-bdd.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,37 @@ const common = require("./karma.common"),

module.exports = config => {
config.set(Object.assign(common, {
// Preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
/*
* Preprocess matching files before serving them to the browser
* available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
*/
preprocessors: {
"spec/public/index.js": ["webpack", "sourcemap"]
},

// Webpack configuration
webpack,

// Test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
/*
* Test results reporter to use
* possible values: 'dots', 'progress'
* available reporters: https://npmjs.org/browse/keyword/karma-reporter
*/
reporters: ["mocha"],

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

// Start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
/*
* Start these browsers
* available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
*/
browsers: ["Chrome"],

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
/*
* Continuous Integration mode
* if true, Karma captures browsers, runs the tests and exits
*/
singleRun: false
}));
};
12 changes: 8 additions & 4 deletions karma.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ module.exports = {
// Base path that will be used to resolve all patterns (eg. files, exclude)
basePath: "",

// Frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
/*
* Frameworks to use
* available frameworks: https://npmjs.org/browse/keyword/karma-adapter
*/
frameworks: ["mocha", "chai-as-promised", "chai-sinon"],

// List of files / patterns to load in the browser
Expand All @@ -21,7 +23,9 @@ module.exports = {
// Enable / disable colors in the output (reporters and logs)
colors: true,

// Level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
/*
* Level of logging
* possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
*/
logLevel: "INFO"
};
26 changes: 17 additions & 9 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@ const common = require("./karma.common"),

module.exports = config => {
config.set(Object.assign(common, {
// Preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
/*
* Preprocess matching files before serving them to the browser
* available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
*/
preprocessors: {
"spec/public/index.js": "webpack"
},

// Webpack configuration
webpack,

// Test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
/*
* Test results reporter to use
* possible values: 'dots', 'progress'
* available reporters: https://npmjs.org/browse/keyword/karma-reporter
*/
reporters: ["mocha", "coverage"],

coverageReporter: {
Expand All @@ -30,12 +34,16 @@ module.exports = config => {
// Enable / disable watching file and executing tests whenever any file changes
autoWatch: false,

// Start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
/*
* Start these browsers
* available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
*/
browsers: ["ChromeHeadless"],

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
/*
* Continuous Integration mode
* if true, Karma captures browsers, runs the tests and exits
*/
singleRun: true
}));
};
Loading

0 comments on commit 36a87bb

Please sign in to comment.