Issue unpin early arg parsing

pkg/cmd/issue/unpin/unpin.go

@@ -16,11 +16,12 @@ import (
 )
 
 type UnpinOptions struct {
-	HttpClient  func() (*http.Client, error)
-	Config      func() (gh.Config, error)
-	IO          *iostreams.IOStreams
-	BaseRepo    func() (ghrepo.Interface, error)
-	SelectorArg string
+	HttpClient func() (*http.Client, error)
+	Config     func() (gh.Config, error)
+	IO         *iostreams.IOStreams
+	BaseRepo   func() (ghrepo.Interface, error)
+
+	IssueNumber int
 }
 
 func NewCmdUnpin(f *cmdutil.Factory, runF func(*UnpinOptions) error) *cobra.Command {
@@ -51,8 +52,22 @@ func NewCmdUnpin(f *cmdutil.Factory, runF func(*UnpinOptions) error) *cobra.Comm
 		`),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.BaseRepo = f.BaseRepo
-			opts.SelectorArg = args[0]
+			issueNumber, baseRepo, err := shared.ParseIssueFromArg(args[0])
+			if err != nil {
+				return err
+			}
+
+			// If the args provided the base repo then use that directly.
+			if baseRepo, present := baseRepo.Value(); present {
+				opts.BaseRepo = func() (ghrepo.Interface, error) {
+					return baseRepo, nil
+				}
+			} else {
+				// support `-R, --repo` override
+				opts.BaseRepo = f.BaseRepo
+			}
+
+			opts.IssueNumber = issueNumber
 
 			if runF != nil {
 				return runF(opts)
@@ -73,7 +88,12 @@ func unpinRun(opts *UnpinOptions) error {
 		return err
 	}
 
-	issue, baseRepo, err := shared.IssueFromArgWithFields(httpClient, opts.BaseRepo, opts.SelectorArg, []string{"id", "number", "title", "isPinned"})
+	baseRepo, err := opts.BaseRepo()
+	if err != nil {
+		return err
+	}
+
+	issue, err := shared.FindIssueOrPR(httpClient, baseRepo, opts.IssueNumber, []string{"id", "number", "title", "isPinned"})
 	if err != nil {
 		return err
 	}

pkg/cmd/issue/unpin/unpin_test.go

@@ -1,80 +1,21 @@
 package unpin
 
 import (
-	"bytes"
 	"net/http"
 	"testing"
 
 	"github.com/cli/cli/v2/internal/config"
 	"github.com/cli/cli/v2/internal/gh"
 	"github.com/cli/cli/v2/internal/ghrepo"
-	"github.com/cli/cli/v2/pkg/cmdutil"
+	"github.com/cli/cli/v2/pkg/cmd/issue/argparsetest"
 	"github.com/cli/cli/v2/pkg/httpmock"
 	"github.com/cli/cli/v2/pkg/iostreams"
-	"github.com/google/shlex"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestNewCmdPin(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		output  UnpinOptions
-		wantErr bool
-		errMsg  string
-	}{
-		{
-			name:    "no argument",
-			input:   "",
-			wantErr: true,
-			errMsg:  "accepts 1 arg(s), received 0",
-		},
-		{
-			name:  "issue number",
-			input: "6",
-			output: UnpinOptions{
-				SelectorArg: "6",
-			},
-		},
-		{
-			name:  "issue url",
-			input: "https://github.com/cli/cli/6",
-			output: UnpinOptions{
-				SelectorArg: "https://github.com/cli/cli/6",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ios, _, _, _ := iostreams.Test()
-			ios.SetStdinTTY(true)
-			ios.SetStdoutTTY(true)
-			f := &cmdutil.Factory{
-				IOStreams: ios,
-			}
-			argv, err := shlex.Split(tt.input)
-			assert.NoError(t, err)
-			var gotOpts *UnpinOptions
-			cmd := NewCmdUnpin(f, func(opts *UnpinOptions) error {
-				gotOpts = opts
-				return nil
-			})
-			cmd.SetArgs(argv)
-			cmd.SetIn(&bytes.Buffer{})
-			cmd.SetOut(&bytes.Buffer{})
-			cmd.SetErr(&bytes.Buffer{})
-
-			_, err = cmd.ExecuteC()
-			if tt.wantErr {
-				assert.Error(t, err)
-				assert.Equal(t, tt.errMsg, err.Error())
-				return
-			}
-
-			assert.NoError(t, err)
-			assert.Equal(t, tt.output.SelectorArg, gotOpts.SelectorArg)
-		})
-	}
+func TestNewCmdUnpin(t *testing.T) {
+	// Test shared parsing of issue number / URL.
+	argparsetest.TestArgParsing(t, NewCmdUnpin)
 }
 
 func TestUnpinRun(t *testing.T) {
@@ -89,7 +30,7 @@ func TestUnpinRun(t *testing.T) {
 		{
 			name: "unpin issue",
 			tty:  true,
-			opts: &UnpinOptions{SelectorArg: "20"},
+			opts: &UnpinOptions{IssueNumber: 20},
 			httpStubs: func(reg *httpmock.Registry) {
 				reg.Register(
 					httpmock.GraphQL(`query IssueByNumber\b`),
@@ -113,7 +54,7 @@ func TestUnpinRun(t *testing.T) {
 		{
 			name: "issue not pinned",
 			tty:  true,
-			opts: &UnpinOptions{SelectorArg: "20"},
+			opts: &UnpinOptions{IssueNumber: 20},
 			httpStubs: func(reg *httpmock.Registry) {
 				reg.Register(
 					httpmock.GraphQL(`query IssueByNumber\b`),