final changes made

pxrth9 · pxrth9 · commit dbebd74a9f4b · 2021-11-01T17:14:04.000-04:00
diff --git a/pkg/cmd/repo/archive/archive.go b/pkg/cmd/repo/archive/archive.go
@@ -93,6 +93,9 @@ func archiveRun(opts *ArchiveOptions) error {
 		if err != nil {
 			return fmt.Errorf("failed to prompt: %w", err)
 		}
+		if !opts.Confirmed {
+			return nil
+		}
 	}
 
 	err = archiveRepo(httpClient, repo)
diff --git a/pkg/cmd/repo/archive/archive_test.go b/pkg/cmd/repo/archive/archive_test.go
@@ -5,9 +5,11 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/cli/cli/v2/internal/ghrepo"
 	"github.com/cli/cli/v2/pkg/cmdutil"
 	"github.com/cli/cli/v2/pkg/httpmock"
 	"github.com/cli/cli/v2/pkg/iostreams"
+	"github.com/cli/cli/v2/pkg/prompt"
 	"github.com/google/shlex"
 	"github.com/stretchr/testify/assert"
 )
@@ -17,42 +19,25 @@ func TestNewCmdArchive(t *testing.T) {
 	tests := []struct {
 		name    string
 		input   string
-		tty     bool
-		output  ArchiveOptions
 		wantErr bool
 		errMsg  string
 	}{
 		{
-			name:  "valid repo",
-			input: "cli/cli",
-			tty:   true,
-			output: ArchiveOptions{
-				RepoArg: "cli/cli",
-			},
-		},
-		{
-			name:    "no argument",
+			name:    "no arguments tty",
 			input:   "",
+			errMsg:  "could not prompt: confirmation with prompt or --confirm flag required",
 			wantErr: true,
-			tty:     true,
-			output: ArchiveOptions{
-				RepoArg: "",
-			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			io, _, _, _ := iostreams.Test()
-			io.SetStdinTTY(tt.tty)
-			io.SetStdoutTTY(tt.tty)
 			f := &cmdutil.Factory{
 				IOStreams: io,
 			}
 			argv, err := shlex.Split(tt.input)
 			assert.NoError(t, err)
-			var gotOpts *ArchiveOptions
 			cmd := NewCmdArchive(f, func(opts *ArchiveOptions) error {
-				gotOpts = opts
 				return nil
 			})
 			cmd.SetArgs(argv)
@@ -66,7 +51,6 @@ func TestNewCmdArchive(t *testing.T) {
 				return
 			}
 			assert.NoError(t, err)
-			assert.Equal(t, tt.output.RepoArg, gotOpts.RepoArg)
 		})
 	}
 }
@@ -76,15 +60,18 @@ func Test_ArchiveRun(t *testing.T) {
 		name       string
 		opts       ArchiveOptions
 		httpStubs  func(*httpmock.Registry)
+		askStubs   func(*prompt.AskStubber)
 		isTTY      bool
 		wantStdout string
 		wantStderr string
 	}{
 		{
 			name:       "unarchived repo tty",
-			opts:       ArchiveOptions{RepoArg: "OWNER/REPO"},
 			wantStdout: "✓ Archived repository OWNER/REPO\n",
-			isTTY:      true,
+			askStubs: func(q *prompt.AskStubber) {
+				q.StubOne(true)
+			},
+			isTTY: true,
 			httpStubs: func(reg *httpmock.Registry) {
 				reg.Register(
 					httpmock.GraphQL(`query RepositoryInfo\b`),
@@ -97,9 +84,15 @@ func Test_ArchiveRun(t *testing.T) {
 			},
 		},
 		{
-			name:  "unarchived repo notty",
-			opts:  ArchiveOptions{RepoArg: "OWNER/REPO"},
-			isTTY: false,
+			name:       "unarchived override repo tty",
+			wantStdout: "✓ Archived repository OWNER/REPO\n",
+			opts: ArchiveOptions{
+				HasRepoOverride: true,
+			},
+			askStubs: func(q *prompt.AskStubber) {
+				q.StubOne(true)
+			},
+			isTTY: true,
 			httpStubs: func(reg *httpmock.Registry) {
 				reg.Register(
 					httpmock.GraphQL(`query RepositoryInfo\b`),
@@ -113,33 +106,54 @@ func Test_ArchiveRun(t *testing.T) {
 		},
 		{
 			name:       "archived repo tty",
-			opts:       ArchiveOptions{RepoArg: "OWNER/REPO"},
 			wantStderr: "! Repository OWNER/REPO is already archived\n",
-			isTTY:      true,
+			opts: ArchiveOptions{
+				HasRepoOverride: true,
+			},
+			askStubs: func(q *prompt.AskStubber) {
+				q.StubOne(true)
+			},
+			isTTY: true,
 			httpStubs: func(reg *httpmock.Registry) {
 				reg.Register(
 					httpmock.GraphQL(`query RepositoryInfo\b`),
 					httpmock.StringResponse(`{ "data": { "repository": {
 												"id": "THE-ID",
-												"isArchived": true } } }`))
+												"isArchived": true} } }`))
 			},
 		},
 		{
-			name:       "archived repo notty",
-			opts:       ArchiveOptions{RepoArg: "OWNER/REPO"},
-			isTTY:      false,
+			name:       "archived override repo tty",
 			wantStderr: "! Repository OWNER/REPO is already archived\n",
+			opts: ArchiveOptions{
+				HasRepoOverride: true,
+			},
+			askStubs: func(q *prompt.AskStubber) {
+				q.StubOne(true)
+			},
+			isTTY: true,
 			httpStubs: func(reg *httpmock.Registry) {
 				reg.Register(
 					httpmock.GraphQL(`query RepositoryInfo\b`),
 					httpmock.StringResponse(`{ "data": { "repository": {
 												"id": "THE-ID",
-												"isArchived": true } } }`))
+												"isArchived": true} } }`))
 			},
 		},
 	}
 
 	for _, tt := range tests {
+		repo, _ := ghrepo.FromFullName("OWNER/REPO")
+		tt.opts.BaseRepo = func() (ghrepo.Interface, error) {
+			return repo, nil
+		}
+
+		q, teardown := prompt.InitAskStubber()
+		defer teardown()
+		if tt.askStubs != nil {
+			tt.askStubs(q)
+		}
+
 		reg := &httpmock.Registry{}
 		if tt.httpStubs != nil {
 			tt.httpStubs(reg)

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ func archiveRun(opts *ArchiveOptions) error {`
`93`	`93`	`if err != nil {`
`94`	`94`	`return fmt.Errorf("failed to prompt: %w", err)`
`95`	`95`	`}`
	`96`	`+ if !opts.Confirmed {`
	`97`	`+ return nil`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`
`98`	`101`	`err = archiveRepo(httpClient, repo)`