Merge pull request #1783 from seipan/refactor-errors-numberOfMissingF…

…lags Refactor numberOfMissingFlags remove
urfave · Jun 26, 2023 · dafd175 · dafd175
2 parents 45b41c8 + 91b9029
commit dafd175
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/errors.go b/errors.go
@@ -55,8 +55,7 @@ type errRequiredFlags struct {
 }
 
 func (e *errRequiredFlags) Error() string {
-	numberOfMissingFlags := len(e.missingFlags)
-	if numberOfMissingFlags == 1 {
+	if len(e.missingFlags) == 1 {
 		return fmt.Sprintf("Required flag %q not set", e.missingFlags[0])
 	}
 	joinedMissingFlags := strings.Join(e.missingFlags, ", ")

diff --git a/errors_test.go b/errors_test.go
@@ -169,3 +169,15 @@ func TestMultiErrorErrorsCopy(t *testing.T) {
 	me := newMultiError(errList...)
 	expect(t, errList, me.Errors())
 }
+
+func TestErrRequiredFlags_Error(t *testing.T) {
+	missingFlags := []string{"flag1", "flag2"}
+	err := &errRequiredFlags{missingFlags: missingFlags}
+	expectedMsg := "Required flags \"flag1, flag2\" not set"
+	expect(t, expectedMsg, err.Error())
+
+	missingFlags = []string{"flag1"}
+	err = &errRequiredFlags{missingFlags: missingFlags}
+	expectedMsg = "Required flag \"flag1\" not set"
+	expect(t, expectedMsg, err.Error())
+}