Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
This commit is contained in:
Corey Johnson 2020-05-12 09:11:15 -07:00
parent fabbfe1da6
commit 2328dffd97
2 changed files with 17 additions and 13 deletions

View file

@ -531,7 +531,7 @@ func prMerge(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
fmt.Fprintf(colorableOut(cmd), "%s Deleted branch %s\n", utils.Red("✔"), utils.Cyan(branch))
fmt.Fprintf(colorableOut(cmd), "%s Deleted local branch %s\n", utils.Red("✔"), utils.Cyan(branch))
}
return nil

View file

@ -1095,15 +1095,19 @@ func TestPrMerge_alreadyMerged(t *testing.T) {
}
func TestPRMerge_interactive(t *testing.T) {
initWithStubs("feature",
initWithStubs("blueberries",
stubResponse{200, bytes.NewBufferString(`
{ "data": {
} }`)})
{ "data": { "repository": { "pullRequests": { "nodes": [
{ "headRefName": "blueberries", "id": "THE-ID", "number": 3}
] } } } }`)},
stubResponse{200, bytes.NewBufferString(`{ "data": {} }`)})
cs, cmdTeardown := test.InitCmdStubber()
defer cmdTeardown()
cs.Stub("")
cs.Stub("")
cs.Stub("")
cs.Stub("")
as, surveyTeardown := initAskStubber()
@ -1111,19 +1115,19 @@ func TestPRMerge_interactive(t *testing.T) {
as.Stub([]*QuestionStub{
{
Name: "choose merge method",
Value: "merge",
Name: "mergeMethod",
Value: 0,
},
{
Name: "delete branch locally",
Default: true,
Value: "Y",
Name: "deleteBranch",
Value: true,
},
})
output, err := RunCommand(`pr merge`)
eq(t, err, nil)
if err != nil {
t.Fatalf("Got unexpected error running `pr merge` %s", err)
}
stderr := string(output.Stderr())
eq(t, strings.Contains(stderr, "warning: could not compute title or body defaults: could not find any commits"), true)
test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted local branch")
}