Merge branch 'master' of github.com:infinitered/solidarity

Author: GantMan

__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]

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)
         }