Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-58994
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Mar 11, 2020
2 parents 64df4df + 759297e commit be65dcb
Show file tree
Hide file tree
Showing 26 changed files with 477 additions and 1,021 deletions.
9 changes: 6 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ const ELASTIC_LICENSE_HEADER = `
*/
`;

const allMochaRules = {};
Object.keys(require('eslint-plugin-mocha').rules).forEach(k => {
allMochaRules['mocha/' + k] = 'off';
});

module.exports = {
root: true,

Expand Down Expand Up @@ -523,9 +528,7 @@ module.exports = {
*/
{
files: ['test/harden/*.js'],
rules: {
'mocha/handle-done-callback': 'off', // TODO: Find a way to disable all mocha rules
},
rules: allMochaRules,
},

/**
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit be65dcb

Please sign in to comment.