From 81ad946df497458c0633c6df9b431a5ae88bacb4 Mon Sep 17 00:00:00 2001 From: Brandon Mills Date: Sun, 21 Nov 2021 12:37:48 -0500 Subject: [PATCH] chore: Update tests using formatter fixture dir --- tests/lib/cli-engine/cli-engine.js | 27 +++++++++++++++++++-------- tests/lib/eslint/eslint.js | 12 +++++++++--- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/tests/lib/cli-engine/cli-engine.js b/tests/lib/cli-engine/cli-engine.js index 2ea9324d164..2ba4839baf6 100644 --- a/tests/lib/cli-engine/cli-engine.js +++ b/tests/lib/cli-engine/cli-engine.js @@ -1165,7 +1165,7 @@ describe("CLIEngine", () => { assert.strictEqual(report.warningCount, 0); assert.strictEqual(report.fixableErrorCount, 0); assert.strictEqual(report.fixableWarningCount, 0); - assert.strictEqual(report.results.length, 4); + assert.strictEqual(report.results.length, 5); assert.strictEqual(path.relative(fixturePath, report.results[0].filePath), "async.js"); assert.strictEqual(report.results[0].errorCount, 0); assert.strictEqual(report.results[0].warningCount, 0); @@ -1178,18 +1178,24 @@ describe("CLIEngine", () => { assert.strictEqual(report.results[1].fixableErrorCount, 0); assert.strictEqual(report.results[1].fixableWarningCount, 0); assert.strictEqual(report.results[1].messages.length, 0); - assert.strictEqual(path.relative(fixturePath, report.results[2].filePath), "simple.js"); + assert.strictEqual(path.relative(fixturePath, report.results[2].filePath), "cwd.js"); assert.strictEqual(report.results[2].errorCount, 0); assert.strictEqual(report.results[2].warningCount, 0); assert.strictEqual(report.results[2].fixableErrorCount, 0); assert.strictEqual(report.results[2].fixableWarningCount, 0); assert.strictEqual(report.results[2].messages.length, 0); - assert.strictEqual(path.relative(fixturePath, report.results[3].filePath), path.join("test", "simple.js")); + assert.strictEqual(path.relative(fixturePath, report.results[3].filePath), "simple.js"); assert.strictEqual(report.results[3].errorCount, 0); assert.strictEqual(report.results[3].warningCount, 0); assert.strictEqual(report.results[3].fixableErrorCount, 0); assert.strictEqual(report.results[3].fixableWarningCount, 0); assert.strictEqual(report.results[3].messages.length, 0); + assert.strictEqual(path.relative(fixturePath, report.results[4].filePath), path.join("test", "simple.js")); + assert.strictEqual(report.results[4].errorCount, 0); + assert.strictEqual(report.results[4].warningCount, 0); + assert.strictEqual(report.results[4].fixableErrorCount, 0); + assert.strictEqual(report.results[4].fixableWarningCount, 0); + assert.strictEqual(report.results[4].messages.length, 0); }); @@ -1207,7 +1213,7 @@ describe("CLIEngine", () => { assert.strictEqual(report.warningCount, 0); assert.strictEqual(report.fixableErrorCount, 6); assert.strictEqual(report.fixableWarningCount, 0); - assert.strictEqual(report.results.length, 4); + assert.strictEqual(report.results.length, 5); assert.strictEqual(path.relative(fixturePath, report.results[0].filePath), "async.js"); assert.strictEqual(report.results[0].errorCount, 0); assert.strictEqual(report.results[0].warningCount, 0); @@ -1218,16 +1224,21 @@ describe("CLIEngine", () => { assert.strictEqual(report.results[1].warningCount, 0); assert.strictEqual(report.results[1].fixableErrorCount, 0); assert.strictEqual(report.results[1].fixableWarningCount, 0); - assert.strictEqual(path.relative(fixturePath, report.results[2].filePath), "simple.js"); - assert.strictEqual(report.results[2].errorCount, 3); + assert.strictEqual(path.relative(fixturePath, report.results[2].filePath), "cwd.js"); + assert.strictEqual(report.results[2].errorCount, 0); assert.strictEqual(report.results[2].warningCount, 0); - assert.strictEqual(report.results[2].fixableErrorCount, 3); + assert.strictEqual(report.results[2].fixableErrorCount, 0); assert.strictEqual(report.results[2].fixableWarningCount, 0); - assert.strictEqual(path.relative(fixturePath, report.results[3].filePath), path.join("test", "simple.js")); + assert.strictEqual(path.relative(fixturePath, report.results[3].filePath), "simple.js"); assert.strictEqual(report.results[3].errorCount, 3); assert.strictEqual(report.results[3].warningCount, 0); assert.strictEqual(report.results[3].fixableErrorCount, 3); assert.strictEqual(report.results[3].fixableWarningCount, 0); + assert.strictEqual(path.relative(fixturePath, report.results[4].filePath), path.join("test", "simple.js")); + assert.strictEqual(report.results[4].errorCount, 3); + assert.strictEqual(report.results[4].warningCount, 0); + assert.strictEqual(report.results[4].fixableErrorCount, 3); + assert.strictEqual(report.results[4].fixableWarningCount, 0); }); it("should process when file is given by not specifying extensions", () => { diff --git a/tests/lib/eslint/eslint.js b/tests/lib/eslint/eslint.js index 2061cd5447f..4e140f7fe0f 100644 --- a/tests/lib/eslint/eslint.js +++ b/tests/lib/eslint/eslint.js @@ -1213,7 +1213,7 @@ describe("ESLint", () => { const fixturePath = getFixturePath("formatters"); const results = await eslint.lintFiles([fixturePath]); - assert.strictEqual(results.length, 4); + assert.strictEqual(results.length, 5); assert.strictEqual(path.relative(fixturePath, results[0].filePath), "async.js"); assert.strictEqual(results[0].errorCount, 0); assert.strictEqual(results[0].warningCount, 0); @@ -1226,18 +1226,24 @@ describe("ESLint", () => { assert.strictEqual(results[1].fixableErrorCount, 0); assert.strictEqual(results[1].fixableWarningCount, 0); assert.strictEqual(results[1].messages.length, 0); - assert.strictEqual(path.relative(fixturePath, results[2].filePath), "simple.js"); + assert.strictEqual(path.relative(fixturePath, results[2].filePath), "cwd.js"); assert.strictEqual(results[2].errorCount, 0); assert.strictEqual(results[2].warningCount, 0); assert.strictEqual(results[2].fixableErrorCount, 0); assert.strictEqual(results[2].fixableWarningCount, 0); assert.strictEqual(results[2].messages.length, 0); - assert.strictEqual(path.relative(fixturePath, results[3].filePath), path.join("test", "simple.js")); + assert.strictEqual(path.relative(fixturePath, results[3].filePath), "simple.js"); assert.strictEqual(results[3].errorCount, 0); assert.strictEqual(results[3].warningCount, 0); assert.strictEqual(results[3].fixableErrorCount, 0); assert.strictEqual(results[3].fixableWarningCount, 0); assert.strictEqual(results[3].messages.length, 0); + assert.strictEqual(path.relative(fixturePath, results[4].filePath), path.join("test", "simple.js")); + assert.strictEqual(results[4].errorCount, 0); + assert.strictEqual(results[4].warningCount, 0); + assert.strictEqual(results[4].fixableErrorCount, 0); + assert.strictEqual(results[4].fixableWarningCount, 0); + assert.strictEqual(results[4].messages.length, 0); }); it("should process when file is given by not specifying extensions", async () => {