commit
9001f738f4
@ -1,47 +1,97 @@
|
|||||||
package cli
|
package cli
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCommandDoNotIgnoreFlags(t *testing.T) {
|
func TestCommandFlagParsing(t *testing.T) {
|
||||||
app := NewApp()
|
cases := []struct {
|
||||||
set := flag.NewFlagSet("test", 0)
|
testArgs []string
|
||||||
test := []string{"blah", "blah", "-break"}
|
skipFlagParsing bool
|
||||||
set.Parse(test)
|
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
|
||||||
|
}
|
||||||
|
|
||||||
c := NewContext(app, set, nil)
|
for _, c := range cases {
|
||||||
|
app := NewApp()
|
||||||
|
app.Writer = ioutil.Discard
|
||||||
|
set := flag.NewFlagSet("test", 0)
|
||||||
|
set.Parse(c.testArgs)
|
||||||
|
|
||||||
command := Command{
|
context := NewContext(app, set, nil)
|
||||||
Name: "test-cmd",
|
|
||||||
Aliases: []string{"tc"},
|
command := Command{
|
||||||
Usage: "this is for testing",
|
Name: "test-cmd",
|
||||||
Description: "testing",
|
Aliases: []string{"tc"},
|
||||||
Action: func(_ *Context) {},
|
Usage: "this is for testing",
|
||||||
}
|
Description: "testing",
|
||||||
err := command.Run(c)
|
Action: func(_ *Context) {},
|
||||||
|
}
|
||||||
|
|
||||||
|
command.SkipFlagParsing = c.skipFlagParsing
|
||||||
|
|
||||||
expect(t, err.Error(), "flag provided but not defined: -break")
|
err := command.Run(context)
|
||||||
|
|
||||||
|
expect(t, err, c.expectedErr)
|
||||||
|
expect(t, []string(context.Args()), c.testArgs)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCommandIgnoreFlags(t *testing.T) {
|
func TestCommand_Run_DoesNotOverwriteErrorFromBefore(t *testing.T) {
|
||||||
app := NewApp()
|
app := NewApp()
|
||||||
set := flag.NewFlagSet("test", 0)
|
app.Commands = []Command{
|
||||||
test := []string{"blah", "blah", "-break"}
|
Command{
|
||||||
set.Parse(test)
|
Name: "bar",
|
||||||
|
Before: func(c *Context) error { return fmt.Errorf("before error") },
|
||||||
|
After: func(c *Context) error { return fmt.Errorf("after error") },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
c := NewContext(app, set, nil)
|
err := app.Run([]string{"foo", "bar"})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatalf("expected to receive error from Run, got none")
|
||||||
|
}
|
||||||
|
|
||||||
command := Command{
|
if !strings.Contains(err.Error(), "before error") {
|
||||||
Name: "test-cmd",
|
t.Errorf("expected text of error from Before method, but got none in \"%v\"", err)
|
||||||
Aliases: []string{"tc"},
|
}
|
||||||
Usage: "this is for testing",
|
if !strings.Contains(err.Error(), "after error") {
|
||||||
Description: "testing",
|
t.Errorf("expected text of error from After method, but got none in \"%v\"", err)
|
||||||
Action: func(_ *Context) {},
|
}
|
||||||
SkipFlagParsing: true,
|
}
|
||||||
|
|
||||||
|
func TestCommand_OnUsageError_WithWrongFlagValue(t *testing.T) {
|
||||||
|
app := NewApp()
|
||||||
|
app.Commands = []Command{
|
||||||
|
Command{
|
||||||
|
Name: "bar",
|
||||||
|
Flags: []Flag{
|
||||||
|
IntFlag{Name: "flag"},
|
||||||
|
},
|
||||||
|
OnUsageError: func(c *Context, err error) error {
|
||||||
|
if !strings.HasPrefix(err.Error(), "invalid value \"wrong\"") {
|
||||||
|
t.Errorf("Expect an invalid value error, but got \"%v\"", err)
|
||||||
|
}
|
||||||
|
return errors.New("intercepted: " + err.Error())
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := app.Run([]string{"foo", "bar", "--flag=wrong"})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatalf("expected to receive error from Run, got none")
|
||||||
}
|
}
|
||||||
err := command.Run(c)
|
|
||||||
|
|
||||||
expect(t, err, nil)
|
if !strings.HasPrefix(err.Error(), "intercepted: invalid value") {
|
||||||
|
t.Errorf("Expect an intercepted error, but got \"%v\"", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in new issue