diff --git a/lib/init/autoconfig.js b/lib/init/autoconfig.js index 64be3d2a84f..31fcd21923b 100644 --- a/lib/init/autoconfig.js +++ b/lib/init/autoconfig.js @@ -301,7 +301,7 @@ class Registry { ruleSetIdx += 1; if (cb) { - cb(totalFilesLinting); // eslint-disable-line callback-return + cb(totalFilesLinting); // eslint-disable-line node/callback-return } }); diff --git a/lib/init/source-code-utils.js b/lib/init/source-code-utils.js index dfc170a65cf..c95f64f69d3 100644 --- a/lib/init/source-code-utils.js +++ b/lib/init/source-code-utils.js @@ -97,7 +97,7 @@ function getSourceCodeOfFiles(patterns, options, callback) { sourceCodes[filename] = sourceCode; } if (callback) { - callback(filenames.length); // eslint-disable-line callback-return + callback(filenames.length); // eslint-disable-line node/callback-return } }); diff --git a/tests/bin/eslint.js b/tests/bin/eslint.js index 8b771dc5bf5..4895dff0523 100644 --- a/tests/bin/eslint.js +++ b/tests/bin/eslint.js @@ -8,7 +8,9 @@ const childProcess = require("child_process"); const fs = require("fs"); const assert = require("chai").assert; -const EXECUTABLE_PATH = require("path").resolve(`${__dirname}/../../bin/eslint.js`); +const path = require("path"); + +const EXECUTABLE_PATH = path.resolve(path.join(__dirname, "../../bin/eslint.js")); /** * Returns a Promise for when a child process exits @@ -166,7 +168,7 @@ describe("bin/eslint.js", () => { it("successfully handles more than 4k data via stdin", () => { const child = runESLint(["--stdin", "--no-eslintrc"]); - const large = fs.createReadStream(`${__dirname}/../bench/large.js`, "utf8"); + const large = fs.createReadStream(path.join(__dirname, "../bench/large.js"), "utf8"); large.pipe(child.stdin); @@ -182,7 +184,7 @@ describe("bin/eslint.js", () => { }); describe("automatically fixing files", () => { - const fixturesPath = `${__dirname}/../fixtures/autofix-integration`; + const fixturesPath = path.join(__dirname, "../fixtures/autofix-integration"); const tempFilePath = `${fixturesPath}/temp.js`; const startingText = fs.readFileSync(`${fixturesPath}/left-pad.js`).toString(); const expectedFixedText = fs.readFileSync(`${fixturesPath}/left-pad-expected.js`).toString(); @@ -359,7 +361,7 @@ describe("bin/eslint.js", () => { }); it("prints the error message pointing to line of code", () => { - const invalidConfig = `${__dirname}/../fixtures/bin/.eslintrc.yml`; + const invalidConfig = path.join(__dirname, "../fixtures/bin/.eslintrc.yml"); const child = runESLint(["--no-ignore", invalidConfig]); const exitCodeAssertion = assertExitCode(child, 2); const outputAssertion = getOutput(child).then(output => { diff --git a/tests/lib/linter/code-path-analysis/code-path.js b/tests/lib/linter/code-path-analysis/code-path.js index 9c0ae9ffc40..0c4fdd18328 100644 --- a/tests/lib/linter/code-path-analysis/code-path.js +++ b/tests/lib/linter/code-path-analysis/code-path.js @@ -50,7 +50,7 @@ function getOrderOfTraversing(codePath, options, callback) { codePath.traverseSegments(options, (segment, controller) => { retv.push(segment.id); if (callback) { - callback(segment, controller); // eslint-disable-line callback-return + callback(segment, controller); // eslint-disable-line node/callback-return } });