refactor: implement error hierarchy for "from" and "to" parameter

scolladon · Mar 30, 2022 · fa3dd68 · fa3dd68
1 parent 7bf4bac
commit fa3dd68
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/__tests__/unit/lib/utils/cliHelper.test.js b/__tests__/unit/lib/utils/cliHelper.test.js
@@ -134,7 +134,7 @@ describe(`test if the application`, () => {
     })
     expect.assertions(1)
     await expect(cliHelper.validateConfig()).rejects.toThrow(
-      '--to  is not a git expression'
+      `--to is blank: '${emptyString}'`
     )
   })
 
@@ -147,7 +147,7 @@ describe(`test if the application`, () => {
     })
     expect.assertions(1)
     await expect(cliHelper.validateConfig()).rejects.toThrow(
-      '--from  is not a git expression'
+      `--from is blank: '${emptyString}'`
     )
   })
 
@@ -161,7 +161,7 @@ describe(`test if the application`, () => {
     })
     expect.assertions(1)
     await expect(cliHelper.validateConfig()).rejects.toThrow(
-      `--to ${notHeadSHA} is not a valid sha pointer`
+      `--to is not a valid sha pointer: '${notHeadSHA}'`
     )
   })
 
@@ -175,7 +175,7 @@ describe(`test if the application`, () => {
     })
     expect.assertions(1)
     await expect(cliHelper.validateConfig()).rejects.toThrow(
-      `--from ${notHeadSHA} is not a valid sha pointer`
+      `--from is not a valid sha pointer: '${notHeadSHA}'`
     )
   })
 })
diff --git a/src/utils/cliHelper.js b/src/utils/cliHelper.js
@@ -37,24 +37,24 @@ class CLIHelper {
   async _validateGitSha() {
     const errors = []
     await Promise.all(
-      ['to', 'from'].map(async field => {
-        if (isBlank(this.config[field])) {
-          errors.push(
-            `--${field} ${this.config[field]} is not a git expression`
-          )
-        }
-
-        const refType = await getStreamContent(
-          spawn('git', [...commitCheckParams, this.config[field]], {
-            cwd: this.config.repo,
-          })
+      ['to', 'from']
+        .filter(
+          field =>
+            !isBlank(this.config[field]) ||
+            errors.push(`--${field} is blank: '${this.config[field]}'`)
         )
-        if (refType?.replace(/\s/g, '') !== COMMIT_REF_TYPE) {
-          errors.push(
-            `--${field} ${this.config[field]} is not a valid sha pointer`
+        .map(async field => {
+          const refType = await getStreamContent(
+            spawn('git', [...commitCheckParams, this.config[field]], {
+              cwd: this.config.repo,
+            })
           )
-        }
-      })
+          if (refType?.replace(/\s/g, '') !== COMMIT_REF_TYPE) {
+            errors.push(
+              `--${field} is not a valid sha pointer: '${this.config[field]}'`
+            )
+          }
+        })
     )
 
     return errors