From dd7e5d9910dd5e89b01c0e112d476a5f2957541c Mon Sep 17 00:00:00 2001 From: Trevor Brindle Date: Tue, 3 Apr 2018 10:50:29 -0400 Subject: [PATCH] fix: return the formatted result of checkCLI --- __tests__/command_helpers/checkRequirement.ts | 4 +++- src/extensions/functions/checkRequirement.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/__tests__/command_helpers/checkRequirement.ts b/__tests__/command_helpers/checkRequirement.ts index 8d4b55e..f913f56 100644 --- a/__tests__/command_helpers/checkRequirement.ts +++ b/__tests__/command_helpers/checkRequirement.ts @@ -189,7 +189,7 @@ describe('checkRequirement', () => { test('failed CLI rule with custom message', async () => { checkCLI.mockClear() - checkCLI.mockImplementation(() => true) + checkCLI.mockImplementation(() => customError) const rule = toPairs({ YARN: [{ rule: 'cli', binary: 'gazorpazorp', error: customError }], })[0] @@ -199,6 +199,8 @@ describe('checkRequirement', () => { }) test('failed ENV rule with custom message', async () => { + checkCLI.mockClear() + checkCLI.mockImplementation(() => true) const rule = toPairs({ YARN: [{ rule: 'env', variable: 'gazorpazorp', error: customError }], })[0] diff --git a/src/extensions/functions/checkRequirement.ts b/src/extensions/functions/checkRequirement.ts index 1b9b768..1ea5b0b 100644 --- a/src/extensions/functions/checkRequirement.ts +++ b/src/extensions/functions/checkRequirement.ts @@ -75,7 +75,7 @@ module.exports = async ( const cliResult = await checkCLI(rule, context) ruleString = `${requirementName} - ${rule.binary} binary` if (cliResult) { - return addFailure(rule.error || cliResult) + return addFailure(cliResult) } else { return addSuccess(ruleString) }