Add test

probablycorey · vilmibm · probablycorey · commit 2328dffd9708 · 2020-05-12T09:11:15.000-07:00
Co-Authored-By: Nate Smith &lt;vilmibm@neongrid.space&gt;
diff --git 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
@@ -1095,35 +1095,39 @@ 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()
 	defer surveyTeardown()
 
 	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")
 }

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`531`	`531`	`if err != nil {`
`532`	`532`	`return err`
`533`	`533`	`}`
`534`		`- fmt.Fprintf(colorableOut(cmd), "%s Deleted branch %s\n", utils.Red("✔"), utils.Cyan(branch))`
	`534`	`+ fmt.Fprintf(colorableOut(cmd), "%s Deleted local branch %s\n", utils.Red("✔"), utils.Cyan(branch))`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`return nil`