not on issues disabled

probablycorey · vilmibm · probablycorey · commit bf94a3161990 · 2020-04-28T10:05:56.000-07:00
Co-Authored-By: Nate Smith &lt;vilmibm@neongrid.space&gt;
diff --git a/api/queries_issue.go b/api/queries_issue.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -64,6 +65,10 @@ type Issue struct {
 	}
 }
 
+type IssuesDisabledError struct {
+	error
+}
+
 const fragments = `
 	fragment issue on Issue {
 		number
@@ -355,16 +360,20 @@ func IssueByNumber(client *Client, repo ghrepo.Interface, number int) (*Issue, e
 	}
 
 	if !resp.Repository.HasIssuesEnabled {
-		return nil, fmt.Errorf("the '%s' repository has disabled issues", ghrepo.FullName(repo))
+
+		return nil, &IssuesDisabledError{fmt.Errorf("the '%s' repository has disabled issues", ghrepo.FullName(repo))}
 	}
 
 	return &resp.Repository.Issue, nil
 }
 
 func IssueClose(client *Client, repo ghrepo.Interface, issueNumber int) error {
 	issue, err := IssueByNumber(client, repo, issueNumber)
-	if err != nil {
-		return fmt.Errorf("Faile to find issue #%d: %w", issueNumber, err)
+	var idErr *IssuesDisabledError
+	if errors.As(err, &idErr) {
+		return fmt.Errorf("issues disabled for %s", ghrepo.FullName(repo))
+	} else if err != nil {
+		return fmt.Errorf("failed to find issue #%d: %w", issueNumber, err)
 	}
 
 	var mutation struct {
diff --git a/command/issue_test.go b/command/issue_test.go
@@ -709,3 +709,26 @@ func TestIssueClose(t *testing.T) {
 		return
 	}
 }
+
+func TestIssueClose_issuesDisabled(t *testing.T) {
+	initBlankContext("", "OWNER/REPO", "master")
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "data": { "repository": {
+		"hasIssuesEnabled": false
+	} } }
+	`))
+
+	_, err := RunCommand(issueCloseCmd, "issue close 13")
+	if err == nil {
+		t.Fatalf("expected error when issues are disabled")
+	}
+
+	if !strings.Contains(err.Error(), "issues disabled") {
+		t.Fatalf("got unexpected error: %s", err)
+	}
+
+	return
+}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package api`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "errors"`
`5`	`6`	`"fmt"`
`6`	`7`	`"time"`
`7`	`8`
`@@ -64,6 +65,10 @@ type Issue struct {`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
	`68`	`+type IssuesDisabledError struct {`
	`69`	`+ error`
	`70`	`+}`
	`71`	`+`
`67`	`72`	const fragments = `
`68`	`73`	`fragment issue on Issue {`
`69`	`74`	`number`
`@@ -355,16 +360,20 @@ func IssueByNumber(client Client, repo ghrepo.Interface, number int) (Issue, e`
`355`	`360`	`}`
`356`	`361`
`357`	`362`	`if !resp.Repository.HasIssuesEnabled {`
`358`		`- return nil, fmt.Errorf("the '%s' repository has disabled issues", ghrepo.FullName(repo))`
	`363`	`+`
	`364`	`+ return nil, &IssuesDisabledError{fmt.Errorf("the '%s' repository has disabled issues", ghrepo.FullName(repo))}`
`359`	`365`	`}`
`360`	`366`
`361`	`367`	`return &resp.Repository.Issue, nil`
`362`	`368`	`}`
`363`	`369`
`364`	`370`	`func IssueClose(client *Client, repo ghrepo.Interface, issueNumber int) error {`
`365`	`371`	`issue, err := IssueByNumber(client, repo, issueNumber)`
`366`		`- if err != nil {`
`367`		`- return fmt.Errorf("Faile to find issue #%d: %w", issueNumber, err)`
	`372`	`+ var idErr *IssuesDisabledError`
	`373`	`+ if errors.As(err, &idErr) {`
	`374`	`+ return fmt.Errorf("issues disabled for %s", ghrepo.FullName(repo))`
	`375`	`+ } else if err != nil {`
	`376`	`+ return fmt.Errorf("failed to find issue #%d: %w", issueNumber, err)`
`368`	`377`	`}`
`369`	`378`
`370`	`379`	`var mutation struct {`