Merge branch 'checks-crash'

mislav · mislav · commit c7a38b6331d8 · 2019-11-20T11:26:16.000+01:00
diff --git a/api/pull_request_test.go b/api/pull_request_test.go
@@ -0,0 +1,39 @@
+package api
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestPullRequest_ChecksStatus(t *testing.T) {
+	pr := PullRequest{}
+	payload := `
+	{ "commits": { "nodes": [{ "commit": {
+		"statusCheckRollup": {
+			"contexts": {
+				"nodes": [
+					{ "state": "SUCCESS" },
+					{ "state": "PENDING" },
+					{ "state": "FAILURE" },
+					{ "status": "IN_PROGRESS",
+					  "conclusion": null },
+					{ "status": "COMPLETED",
+					  "conclusion": "SUCCESS" },
+					{ "status": "COMPLETED",
+					  "conclusion": "FAILURE" },
+					{ "status": "COMPLETED",
+					  "conclusion": "ACTION_REQUIRED" }
+				]
+			}
+		}
+	} }] } }
+	`
+	err := json.Unmarshal([]byte(payload), &pr)
+	eq(t, err, nil)
+
+	checks := pr.ChecksStatus()
+	eq(t, checks.Total, 7)
+	eq(t, checks.Pending, 2)
+	eq(t, checks.Failing, 3)
+	eq(t, checks.Passing, 2)
+}
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -38,6 +38,7 @@ type PullRequest struct {
 					Contexts struct {
 						Nodes []struct {
 							State      string
+							Status     string
 							Conclusion string
 						}
 					}
@@ -86,16 +87,21 @@ func (pr *PullRequest) ChecksStatus() (summary PullRequestChecksStatus) {
 	}
 	commit := pr.Commits.Nodes[0].Commit
 	for _, c := range commit.StatusCheckRollup.Contexts.Nodes {
-		state := c.State
+		state := c.State // StatusContext
 		if state == "" {
-			state = c.Conclusion
+			// CheckRun
+			if c.Status == "COMPLETED" {
+				state = c.Conclusion
+			} else {
+				state = c.Status
+			}
 		}
 		switch state {
 		case "SUCCESS", "NEUTRAL", "SKIPPED":
 			summary.Passing++
 		case "ERROR", "FAILURE", "CANCELLED", "TIMED_OUT", "ACTION_REQUIRED":
 			summary.Failing++
-		case "EXPECTED", "QUEUED", "PENDING", "IN_PROGRESS":
+		case "EXPECTED", "REQUESTED", "QUEUED", "PENDING", "IN_PROGRESS":
 			summary.Pending++
 		default:
 			panic(fmt.Errorf("unsupported status: %q", state))
@@ -150,6 +156,7 @@ func PullRequests(client *Client, ghRepo Repo, currentBranch, currentUsername st
 									state
 								}
 								...on CheckRun {
+									status
 									conclusion
 								}
 							}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ type PullRequest struct {`
`38`	`38`	`Contexts struct {`
`39`	`39`	`Nodes []struct {`
`40`	`40`	`State string`
	`41`	`+ Status string`
`41`	`42`	`Conclusion string`
`42`	`43`	`}`
`43`	`44`	`}`
`@@ -86,16 +87,21 @@ func (pr *PullRequest) ChecksStatus() (summary PullRequestChecksStatus) {`
`86`	`87`	`}`
`87`	`88`	`commit := pr.Commits.Nodes[0].Commit`
`88`	`89`	`for _, c := range commit.StatusCheckRollup.Contexts.Nodes {`
`89`		`- state := c.State`
	`90`	`+ state := c.State // StatusContext`
`90`	`91`	`if state == "" {`
`91`		`- state = c.Conclusion`
	`92`	`+ // CheckRun`
	`93`	`+ if c.Status == "COMPLETED" {`
	`94`	`+ state = c.Conclusion`
	`95`	`+ } else {`
	`96`	`+ state = c.Status`
	`97`	`+ }`
`92`	`98`	`}`
`93`	`99`	`switch state {`
`94`	`100`	`case "SUCCESS", "NEUTRAL", "SKIPPED":`
`95`	`101`	`summary.Passing++`
`96`	`102`	`case "ERROR", "FAILURE", "CANCELLED", "TIMED_OUT", "ACTION_REQUIRED":`
`97`	`103`	`summary.Failing++`
`98`		`- case "EXPECTED", "QUEUED", "PENDING", "IN_PROGRESS":`
	`104`	`+ case "EXPECTED", "REQUESTED", "QUEUED", "PENDING", "IN_PROGRESS":`
`99`	`105`	`summary.Pending++`
`100`	`106`	`default:`
`101`	`107`	`panic(fmt.Errorf("unsupported status: %q", state))`
`@@ -150,6 +156,7 @@ func PullRequests(client *Client, ghRepo Repo, currentBranch, currentUsername st`
`150`	`156`	`state`
`151`	`157`	`}`
`152`	`158`	`...on CheckRun {`
	`159`	`+ status`
`153`	`160`	`conclusion`
`154`	`161`	`}`
`155`	`162`	`}`