Merge pull request cli#3525 from cristiand391/improve-issue-status-detection

mislav · web-flow · commit 25d79c4e16d5 · 2021-05-03T21:04:35.000+02:00
Improve issue status detection
diff --git a/api/queries_issue.go b/api/queries_issue.go
@@ -237,7 +237,6 @@ func IssueByNumber(client *Client, repo ghrepo.Interface, number int) (*Issue, e
 				id
 				title
 				state
-				closed
 				body
 				author {
 					login
diff --git a/pkg/cmd/issue/close/close.go b/pkg/cmd/issue/close/close.go
@@ -65,7 +65,7 @@ func closeRun(opts *CloseOptions) error {
 		return err
 	}
 
-	if issue.Closed {
+	if issue.State == "CLOSED" {
 		fmt.Fprintf(opts.IO.ErrOut, "%s Issue #%d (%s) is already closed\n", cs.Yellow("!"), issue.Number, issue.Title)
 		return nil
 	}
diff --git a/pkg/cmd/issue/close/close_test.go b/pkg/cmd/issue/close/close_test.go
@@ -96,7 +96,7 @@ func TestIssueClose_alreadyClosed(t *testing.T) {
 		httpmock.StringResponse(`
 			{ "data": { "repository": {
 				"hasIssuesEnabled": true,
-				"issue": { "number": 13, "title": "The title of the issue", "closed": true}
+				"issue": { "number": 13, "title": "The title of the issue", "state": "CLOSED"}
 			} } }`),
 	)
 
diff --git a/pkg/cmd/issue/reopen/reopen.go b/pkg/cmd/issue/reopen/reopen.go
@@ -65,7 +65,7 @@ func reopenRun(opts *ReopenOptions) error {
 		return err
 	}
 
-	if !issue.Closed {
+	if issue.State == "OPEN" {
 		fmt.Fprintf(opts.IO.ErrOut, "%s Issue #%d (%s) is already open\n", cs.Yellow("!"), issue.Number, issue.Title)
 		return nil
 	}
diff --git a/pkg/cmd/issue/reopen/reopen_test.go b/pkg/cmd/issue/reopen/reopen_test.go
@@ -64,7 +64,7 @@ func TestIssueReopen(t *testing.T) {
 		httpmock.StringResponse(`
 			{ "data": { "repository": {
 				"hasIssuesEnabled": true,
-				"issue": { "id": "THE-ID", "number": 2, "closed": true, "title": "The title of the issue"}
+				"issue": { "id": "THE-ID", "number": 2, "state": "CLOSED", "title": "The title of the issue"}
 			} } }`),
 	)
 	http.Register(
@@ -96,7 +96,7 @@ func TestIssueReopen_alreadyOpen(t *testing.T) {
 		httpmock.StringResponse(`
 			{ "data": { "repository": {
 				"hasIssuesEnabled": true,
-				"issue": { "number": 2, "closed": false, "title": "The title of the issue"}
+				"issue": { "number": 2, "state": "OPEN", "title": "The title of the issue"}
 			} } }`),
 	)
 
diff --git a/pkg/cmd/issue/transfer/transfer_test.go b/pkg/cmd/issue/transfer/transfer_test.go
@@ -118,7 +118,7 @@ func Test_transferRunSuccessfulIssueTransfer(t *testing.T) {
 		httpmock.StringResponse(`
 			{ "data": { "repository": {
 				"hasIssuesEnabled": true,
-				"issue": { "id": "THE-ID", "number": 1234, "closed": true, "title": "The title of the issue"}
+				"issue": { "id": "THE-ID", "number": 1234, "title": "The title of the issue"}
 			} } }`))
 
 	http.Register(

-Original file line number
+Diff line change
 				id
 				title
 				state
 -				closed
 				body
 				author {
 					login
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func closeRun(opts *CloseOptions) error {`
`65`	`65`	`return err`
`66`	`66`	`}`
`67`	`67`
`68`		`- if issue.Closed {`
	`68`	`+ if issue.State == "CLOSED" {`
`69`	`69`	`fmt.Fprintf(opts.IO.ErrOut, "%s Issue #%d (%s) is already closed\n", cs.Yellow("!"), issue.Number, issue.Title)`
`70`	`70`	`return nil`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func TestIssueClose_alreadyClosed(t *testing.T) {`
`96`	`96`	httpmock.StringResponse(`
`97`	`97`	`{ "data": { "repository": {`
`98`	`98`	`"hasIssuesEnabled": true,`
`99`		`- "issue": { "number": 13, "title": "The title of the issue", "closed": true}`
	`99`	`+ "issue": { "number": 13, "title": "The title of the issue", "state": "CLOSED"}`
`100`	`100`	} } }`),
`101`	`101`	`)`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func reopenRun(opts *ReopenOptions) error {`
`65`	`65`	`return err`
`66`	`66`	`}`
`67`	`67`
`68`		`- if !issue.Closed {`
	`68`	`+ if issue.State == "OPEN" {`
`69`	`69`	`fmt.Fprintf(opts.IO.ErrOut, "%s Issue #%d (%s) is already open\n", cs.Yellow("!"), issue.Number, issue.Title)`
`70`	`70`	`return nil`
`71`	`71`	`}`