Fix:(issue_1094) Dont execute Before/After handlers during shell completion
This commit is contained in:
parent
2b1a8cad54
commit
42d8058ed9
8
app.go
8
app.go
@ -302,7 +302,7 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
|
||||
return err
|
||||
}
|
||||
|
||||
if a.After != nil {
|
||||
if a.After != nil && !cCtx.shellComplete {
|
||||
defer func() {
|
||||
if afterErr := a.After(cCtx); afterErr != nil {
|
||||
if err != nil {
|
||||
@ -330,7 +330,7 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
|
||||
return cerr
|
||||
}
|
||||
|
||||
if a.Before != nil {
|
||||
if a.Before != nil && !cCtx.shellComplete {
|
||||
beforeErr := a.Before(cCtx)
|
||||
if beforeErr != nil {
|
||||
a.handleExitCoder(cCtx, beforeErr)
|
||||
@ -497,7 +497,7 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
|
||||
return cerr
|
||||
}
|
||||
|
||||
if a.After != nil {
|
||||
if a.After != nil && !cCtx.shellComplete {
|
||||
defer func() {
|
||||
afterErr := a.After(cCtx)
|
||||
if afterErr != nil {
|
||||
@ -511,7 +511,7 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
|
||||
}()
|
||||
}
|
||||
|
||||
if a.Before != nil {
|
||||
if a.Before != nil && !cCtx.shellComplete {
|
||||
beforeErr := a.Before(cCtx)
|
||||
if beforeErr != nil {
|
||||
a.handleExitCoder(cCtx, beforeErr)
|
||||
|
52
app_test.go
52
app_test.go
@ -1245,6 +1245,58 @@ func TestApp_BeforeFunc(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestApp_BeforeFuncShellCompletion(t *testing.T) {
|
||||
counts := &opCounts{}
|
||||
var err error
|
||||
|
||||
app := &App{
|
||||
EnableBashCompletion: true,
|
||||
Before: func(c *Context) error {
|
||||
counts.Total++
|
||||
counts.Before = counts.Total
|
||||
return nil
|
||||
},
|
||||
After: func(c *Context) error {
|
||||
counts.Total++
|
||||
counts.After = counts.Total
|
||||
return nil
|
||||
},
|
||||
Commands: []*Command{
|
||||
{
|
||||
Name: "sub",
|
||||
Action: func(c *Context) error {
|
||||
counts.Total++
|
||||
counts.SubCommand = counts.Total
|
||||
return nil
|
||||
},
|
||||
},
|
||||
},
|
||||
Flags: []Flag{
|
||||
&StringFlag{Name: "opt"},
|
||||
},
|
||||
Writer: ioutil.Discard,
|
||||
}
|
||||
|
||||
// run with the Before() func succeeding
|
||||
err = app.Run([]string{"command", "--opt", "succeed", "sub", "--generate-bash-completion"})
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("Run error: %s", err)
|
||||
}
|
||||
|
||||
if counts.Before != 0 {
|
||||
t.Errorf("Before() executed when not expected")
|
||||
}
|
||||
|
||||
if counts.After != 0 {
|
||||
t.Errorf("After() executed when not expected")
|
||||
}
|
||||
|
||||
if counts.SubCommand != 0 {
|
||||
t.Errorf("Subcommand executed more than expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestApp_AfterFunc(t *testing.T) {
|
||||
counts := &opCounts{}
|
||||
afterError := fmt.Errorf("fail")
|
||||
|
Loading…
Reference in New Issue
Block a user