diff --git a/pkg/cmd/pr/merge/merge_test.go b/pkg/cmd/pr/merge/merge_test.go index 2b5f89e7b..19b1d3110 100644 --- a/pkg/cmd/pr/merge/merge_test.go +++ b/pkg/cmd/pr/merge/merge_test.go @@ -197,6 +197,8 @@ func TestPrMerge(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge) cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git symbolic-ref --quiet --short HEAD @@ -242,6 +244,8 @@ func TestPrMerge_nontty(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge) cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git symbolic-ref --quiet --short HEAD @@ -284,6 +288,8 @@ func TestPrMerge_withRepoFlag(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + output, err := runCommand(http, "master", true, "pr merge 1 --merge -R OWNER/REPO") if err != nil { t.Fatalf("error running command `pr merge`: %v", err) @@ -318,6 +324,8 @@ func TestPrMerge_deleteBranch(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git checkout master cs.Stub("") // git rev-parse --verify blueberries` @@ -351,6 +359,9 @@ func TestPrMerge_deleteNonCurrentBranch(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + + prompt.StubConfirm(true) + // We don't expect the default branch to be checked out, just that blueberries is deleted cs.Stub("") // git rev-parse --verify blueberries cs.Stub("") // git branch -d blueberries @@ -384,6 +395,8 @@ func TestPrMerge_noPrNumberGiven(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge) cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git symbolic-ref --quiet --short HEAD @@ -429,6 +442,8 @@ func TestPrMerge_rebase(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git symbolic-ref --quiet --short HEAD cs.Stub("") // git checkout master @@ -473,6 +488,8 @@ func TestPrMerge_squash(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git symbolic-ref --quiet --short HEAD cs.Stub("") // git checkout master @@ -499,6 +516,8 @@ func TestPrMerge_alreadyMerged(t *testing.T) { cs, cmdTeardown := test.InitCmdStubber() defer cmdTeardown() + prompt.StubConfirm(true) + cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$ cs.Stub("") // git symbolic-ref --quiet --short HEAD cs.Stub("") // git checkout master @@ -561,6 +580,8 @@ func TestPRMerge_interactive(t *testing.T) { }, }) + prompt.StubConfirm(true) + output, err := runCommand(http, "blueberries", true, "") if err != nil { t.Fatalf("Got unexpected error running `pr merge` %s", err)