From 2328dffd9708733c81ac6de39de920890b90180b Mon Sep 17 00:00:00 2001
From: Corey Johnson <probablycorey@gmail.com>
Date: Tue, 12 May 2020 09:11:15 -0700
Subject: [PATCH] Add test

Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
---
 command/pr.go      |  2 +-
 command/pr_test.go | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/command/pr.go b/command/pr.go
index 5fa277ad5..071bea50c 100644
--- a/command/pr.go
+++ b/command/pr.go
@@ -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
diff --git a/command/pr_test.go b/command/pr_test.go
index 54883754c..3920cb4e6 100644
--- a/command/pr_test.go
+++ b/command/pr_test.go
@@ -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")
 }