Update tests

probablycorey · probablycorey · commit ae70a814bd2d · 2020-05-20T14:53:52.000-07:00
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -1029,16 +1029,17 @@ func TestPrMerge_deleteBranch(t *testing.T) {
 	defer cmdTeardown()
 
 	cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
-	cs.Stub("") // git symbolic-ref --quiet --short HEAD
 	cs.Stub("") // git checkout master
+	cs.Stub("") // git rev-parse --verify blueberries`
 	cs.Stub("") // git branch -d
+	cs.Stub("") // git push origin --delete blueberries
 
 	output, err := RunCommand(`pr merge --merge --delete-branch`)
 	if err != nil {
 		t.Fatalf("Got unexpected error running `pr merge` %s", err)
 	}
 
-	test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted local branch")
+	test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted branch blueberries")
 }
 
 func TestPrMerge_deleteNonCurrentBranch(t *testing.T) {
@@ -1055,14 +1056,16 @@ func TestPrMerge_deleteNonCurrentBranch(t *testing.T) {
 	cs, cmdTeardown := test.InitCmdStubber()
 	defer cmdTeardown()
 	// 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
+	cs.Stub("") // git push origin --delete blueberries
 
 	output, err := RunCommand(`pr merge --merge --delete-branch blueberries`)
 	if err != nil {
 		t.Fatalf("Got unexpected error running `pr merge` %s", err)
 	}
 
-	test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted local branch")
+	test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted branch blueberries")
 }
 
 func TestPrMerge_noPrNumberGiven(t *testing.T) {
@@ -1193,6 +1196,7 @@ func TestPRMerge_interactive(t *testing.T) {
 	cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
 	cs.Stub("") // git symbolic-ref --quiet --short HEAD
 	cs.Stub("") // git checkout master
+	cs.Stub("") // git push origin --delete blueberries
 	cs.Stub("") // git branch -d
 
 	as, surveyTeardown := initAskStubber()
@@ -1214,7 +1218,7 @@ func TestPRMerge_interactive(t *testing.T) {
 		t.Fatalf("Got unexpected error running `pr merge` %s", err)
 	}
 
-	test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted local branch")
+	test.ExpectLines(t, output.String(), "Merged pull request #3", "Deleted branch blueberries")
 }
 
 func TestPrMerge_multipleMergeMethods(t *testing.T) {
diff --git a/git/git.go b/git/git.go
@@ -217,8 +217,7 @@ func DeleteRemoteBranch(branch string) error {
 
 func DoesLocalBranchExist(branch string) bool {
 	configCmd := GitCommand("rev-parse", "--verify", branch)
-	x, err := run.PrepareCmd(configCmd).Output()
-	fmt.Printf("🌭 %+v|%+v\n", x, err != nil)
+	_, err := run.PrepareCmd(configCmd).Output()
 	return err == nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,7 @@ func DeleteRemoteBranch(branch string) error {`
`217`	`217`
`218`	`218`	`func DoesLocalBranchExist(branch string) bool {`
`219`	`219`	`configCmd := GitCommand("rev-parse", "--verify", branch)`
`220`		`- x, err := run.PrepareCmd(configCmd).Output()`
`221`		`- fmt.Printf("🌭 %+v\|%+v\n", x, err != nil)`
	`220`	`+ _, err := run.PrepareCmd(configCmd).Output()`
`222`	`221`	`return err == nil`
`223`	`222`	`}`
`224`	`223`