From e12cd17be2d80585d7b9fc9710e0fdbfd6bc3c2e Mon Sep 17 00:00:00 2001 From: evelyn masso Date: Fri, 23 Nov 2018 07:42:29 -0800 Subject: [PATCH] ensure --list-different + --write reports status code 0 (#5512) * change exit code for list different and write * update existing tests --- src/cli/util.js | 6 ++++-- tests_integration/__tests__/infer-parser.js | 2 +- tests_integration/__tests__/piped-output.js | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cli/util.js b/src/cli/util.js index cb69ac23384b..bfbcc7efec51 100644 --- a/src/cli/util.js +++ b/src/cli/util.js @@ -146,8 +146,8 @@ function listDifferent(context, input, options, filename) { if (!prettier.check(input, options)) { if (!context.argv["write"]) { context.logger.log(filename); + process.exitCode = 1; } - process.exitCode = 1; } } catch (error) { context.logger.error(error.message); @@ -498,7 +498,9 @@ function formatFiles(context) { if (context.argv["list-different"] && isDifferent) { context.logger.log(filename); - process.exitCode = 1; + if (!context.argv["write"]) { + process.exitCode = 1; + } } if (context.argv["write"]) { diff --git a/tests_integration/__tests__/infer-parser.js b/tests_integration/__tests__/infer-parser.js index da2d673fb1e0..de4ded99fae0 100644 --- a/tests_integration/__tests__/infer-parser.js +++ b/tests_integration/__tests__/infer-parser.js @@ -113,7 +113,7 @@ describe("--write and --list-different with unknown path and no parser", () => { describe("multiple files", () => { runPrettier("cli/infer-parser/", ["--list-different", "--write", "*"]).test( - { status: 1 } + { status: 0 } ); }); }); diff --git a/tests_integration/__tests__/piped-output.js b/tests_integration/__tests__/piped-output.js index 92dabaf32c6c..b77262eff4a9 100644 --- a/tests_integration/__tests__/piped-output.js +++ b/tests_integration/__tests__/piped-output.js @@ -8,7 +8,7 @@ describe("output with --list-different + unformatted differs when piped", () => ["--write", "--list-different", "--no-color", "unformatted.js"], { stdoutIsTTY: true } ).test({ - status: 1 + status: 0 }); const result1 = runPrettier( @@ -16,7 +16,7 @@ describe("output with --list-different + unformatted differs when piped", () => ["--write", "--list-different", "--no-color", "unformatted.js"], { stdoutIsTTY: false } ).test({ - status: 1 + status: 0 }); expect(result0.stdout.length).toBeGreaterThan(result1.stdout.length);