Merge pull request cli#3688 from cli/pr-merge-fix

mislav · web-flow · commit 09a92c6e1dda · 2021-05-21T19:30:32.000+02:00
Fix `pr merge` with GHE &lt; 3.0
diff --git a/api/query_builder.go b/api/query_builder.go
@@ -208,6 +208,8 @@ func PullRequestGraphQL(fields []string) string {
 			q = append(q, prFiles)
 		case "commits":
 			q = append(q, prCommits)
+		case "lastCommit": // pseudo-field
+			q = append(q, `commits(last:1){nodes{commit{oid}}}`)
 		case "commitsCount": // pseudo-field
 			q = append(q, `commits{totalCount}`)
 		case "statusCheckRollup":
diff --git a/pkg/cmd/pr/merge/merge.go b/pkg/cmd/pr/merge/merge.go
@@ -156,7 +156,7 @@ func mergeRun(opts *MergeOptions) error {
 
 	findOptions := shared.FindOptions{
 		Selector: opts.SelectorArg,
-		Fields:   []string{"id", "number", "state", "title", "commits", "mergeable", "headRepositoryOwner", "headRefName"},
+		Fields:   []string{"id", "number", "state", "title", "lastCommit", "mergeable", "headRepositoryOwner", "headRefName"},
 	}
 	pr, baseRepo, err := opts.Finder.Find(findOptions)
 	if err != nil {
diff --git a/pkg/cmd/pr/merge/merge_test.go b/pkg/cmd/pr/merge/merge_test.go
@@ -464,11 +464,8 @@ func Test_nonDivergingPullRequest(t *testing.T) {
 	}
 	stubCommit(pr, "COMMITSHA1")
 
-	shared.RunCommandFinder(
-		"",
-		pr,
-		baseRepo("OWNER", "REPO", "master"),
-	)
+	prFinder := shared.RunCommandFinder("", pr, baseRepo("OWNER", "REPO", "master"))
+	prFinder.ExpectFields([]string{"id", "number", "state", "title", "lastCommit", "mergeable", "headRepositoryOwner", "headRefName"})
 
 	http.Register(
 		httpmock.GraphQL(`mutation PullRequestMerge\b`),
@@ -505,11 +502,8 @@ func Test_divergingPullRequestWarning(t *testing.T) {
 	}
 	stubCommit(pr, "COMMITSHA1")
 
-	shared.RunCommandFinder(
-		"",
-		pr,
-		baseRepo("OWNER", "REPO", "master"),
-	)
+	prFinder := shared.RunCommandFinder("", pr, baseRepo("OWNER", "REPO", "master"))
+	prFinder.ExpectFields([]string{"id", "number", "state", "title", "lastCommit", "mergeable", "headRepositoryOwner", "headRefName"})
 
 	http.Register(
 		httpmock.GraphQL(`mutation PullRequestMerge\b`),
diff --git a/pkg/cmd/pr/status/fixtures/prStatusCurrentBranchClosed.json b/pkg/cmd/pr/status/fixtures/prStatusCurrentBranchClosed.json
@@ -12,24 +12,7 @@
               "state": "CLOSED",
               "url": "https://github.com/cli/cli/pull/8",
               "headRefName": "blueberries",
-              "reviewDecision": "CHANGES_REQUESTED",
-              "commits": {
-                "nodes": [
-                  {
-                    "commit": {
-                      "statusCheckRollup": {
-                        "contexts": {
-                          "nodes": [
-                            {
-                              "state": "SUCCESS"
-                            }
-                          ]
-                        }
-                      }
-                    }
-                  }
-                ]
-              }
+              "reviewDecision": "CHANGES_REQUESTED"
             }
           }
         ]
diff --git a/pkg/cmd/pr/status/fixtures/prStatusCurrentBranchMerged.json b/pkg/cmd/pr/status/fixtures/prStatusCurrentBranchMerged.json
@@ -12,24 +12,7 @@
               "state": "MERGED",
               "url": "https://github.com/cli/cli/pull/8",
               "headRefName": "blueberries",
-              "reviewDecision": "CHANGES_REQUESTED",
-              "commits": {
-                "nodes": [
-                  {
-                    "commit": {
-                      "statusCheckRollup": {
-                        "contexts": {
-                          "nodes": [
-                            {
-                              "state": "SUCCESS"
-                            }
-                          ]
-                        }
-                      }
-                    }
-                  }
-                ]
-              }
+              "reviewDecision": "CHANGES_REQUESTED"
             }
           }
         ]

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func mergeRun(opts *MergeOptions) error {`
`156`	`156`
`157`	`157`	`findOptions := shared.FindOptions{`
`158`	`158`	`Selector: opts.SelectorArg,`
`159`		`- Fields: []string{"id", "number", "state", "title", "commits", "mergeable", "headRepositoryOwner", "headRefName"},`
	`159`	`+ Fields: []string{"id", "number", "state", "title", "lastCommit", "mergeable", "headRepositoryOwner", "headRefName"},`
`160`	`160`	`}`
`161`	`161`	`pr, baseRepo, err := opts.Finder.Find(findOptions)`
`162`	`162`	`if err != nil {`