Use a test table and add --help test

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

command_test.go

@@ -1,17 +1,29 @@
 package cli
 
 import (
+	"errors"
 	"flag"
 	"testing"
 )
 
-func TestCommandDoNotIgnoreFlags(t *testing.T) {
+func TestCommandFlagParsing(t *testing.T) {
+	cases := []struct {
+		testArgs        []string
+		skipFlagParsing bool
+		expectedErr     error
+	}{
+		{[]string{"blah", "blah", "-break"}, false, errors.New("flag provided but not defined: -break")}, // Test normal "not ignoring flags" flow
+		{[]string{"blah", "blah"}, true, nil},                                                            // Test SkipFlagParsing without any args that look like flags
+		{[]string{"blah", "-break"}, true, nil},                                                          // Test SkipFlagParsing with random flag arg
+		{[]string{"blah", "-help"}, true, nil},                                                           // Test SkipFlagParsing with "special" help flag arg
+	}
+
+	for _, c := range cases {
 		app := NewApp()
 		set := flag.NewFlagSet("test", 0)
-	test := []string{"blah", "blah", "-break"}
+		set.Parse(c.testArgs)
-	set.Parse(test)
 
-	c := NewContext(app, set, nil)
+		context := NewContext(app, set, nil)
 
 		command := Command{
 			Name:        "test-cmd",
@@ -20,51 +32,12 @@ func TestCommandDoNotIgnoreFlags(t *testing.T) {
 			Description: "testing",
 			Action:      func(_ *Context) {},
 		}
-	err := command.Run(c)
 
-	expect(t, err.Error(), "flag provided but not defined: -break")
+		command.SkipFlagParsing = c.skipFlagParsing
-}
 
-func TestCommandIgnoreFlags(t *testing.T) {
+		err := command.Run(context)
-	app := NewApp()
-	set := flag.NewFlagSet("test", 0)
-	test := []string{"blah", "blah", "-break"}
-	set.Parse(test)
 
-	c := NewContext(app, set, nil)
+		expect(t, err, c.expectedErr)
-
+		expect(t, []string(context.Args()), c.testArgs)
-	command := Command{
-		Name:            "test-cmd",
-		Aliases:         []string{"tc"},
-		Usage:           "this is for testing",
-		Description:     "testing",
-		Action:          func(_ *Context) {},
-		SkipFlagParsing: true,
 	}
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-// Fix bug with ignoring flag parsing that would still parse the first flag
-func TestCommandIgnoreFlagsIncludingFirstArgument(t *testing.T) {
-	app := NewApp()
-	set := flag.NewFlagSet("test", 0)
-	test := []string{"blah", "-break"}
-	set.Parse(test)
-
-	c := NewContext(app, set, nil)
-
-	command := Command{
-		Name:            "test-cmd",
-		Aliases:         []string{"tc"},
-		Usage:           "this is for testing",
-		Description:     "testing",
-		Action:          func(_ *Context) {},
-		SkipFlagParsing: true,
-	}
-	err := command.Run(c)
-	expect(t, err, nil)
-
-	expect(t, []string(c.Args()), []string{"blah", "-break"})
 }