Merge pull request cli#3714 from cli/pr-checkout-push

mislav · web-flow · commit ebf2bb9f4b0f · 2021-05-26T12:49:24.000+02:00
Fix `pr checkout` setting up git push configuration
diff --git a/pkg/cmd/pr/checkout/checkout.go b/pkg/cmd/pr/checkout/checkout.go
@@ -72,7 +72,7 @@ func NewCmdCheckout(f *cmdutil.Factory, runF func(*CheckoutOptions) error) *cobr
 func checkoutRun(opts *CheckoutOptions) error {
 	findOptions := shared.FindOptions{
 		Selector: opts.SelectorArg,
-		Fields:   []string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository"},
+		Fields:   []string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository", "maintainerCanModify"},
 	}
 	pr, baseRepo, err := opts.Finder.Find(findOptions)
 	if err != nil {
diff --git a/pkg/cmd/pr/checkout/checkout_test.go b/pkg/cmd/pr/checkout/checkout_test.go
@@ -205,7 +205,7 @@ func TestPRCheckout_sameRepo(t *testing.T) {
 
 	baseRepo, pr := stubPR("OWNER/REPO", "OWNER/REPO:feature")
 	finder := shared.RunCommandFinder("123", pr, baseRepo)
-	finder.ExpectFields([]string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository"})
+	finder.ExpectFields([]string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository", "maintainerCanModify"})
 
 	cs, cmdTeardown := run.Stub()
 	defer cmdTeardown(t)
@@ -260,7 +260,7 @@ func TestPRCheckout_differentRepo_remoteExists(t *testing.T) {
 
 	baseRepo, pr := stubPR("OWNER/REPO", "hubot/REPO:feature")
 	finder := shared.RunCommandFinder("123", pr, baseRepo)
-	finder.ExpectFields([]string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository"})
+	finder.ExpectFields([]string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository", "maintainerCanModify"})
 
 	cs, cmdTeardown := run.Stub()
 	defer cmdTeardown(t)
@@ -283,7 +283,7 @@ func TestPRCheckout_differentRepo(t *testing.T) {
 
 	baseRepo, pr := stubPR("OWNER/REPO:master", "hubot/REPO:feature")
 	finder := shared.RunCommandFinder("123", pr, baseRepo)
-	finder.ExpectFields([]string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository"})
+	finder.ExpectFields([]string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository", "maintainerCanModify"})
 
 	cs, cmdTeardown := run.Stub()
 	defer cmdTeardown(t)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func NewCmdCheckout(f cmdutil.Factory, runF func(CheckoutOptions) error) *cobr`
`72`	`72`	`func checkoutRun(opts *CheckoutOptions) error {`
`73`	`73`	`findOptions := shared.FindOptions{`
`74`	`74`	`Selector: opts.SelectorArg,`
`75`		`- Fields: []string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository"},`
	`75`	`+ Fields: []string{"number", "headRefName", "headRepository", "headRepositoryOwner", "isCrossRepository", "maintainerCanModify"},`
`76`	`76`	`}`
`77`	`77`	`pr, baseRepo, err := opts.Finder.Find(findOptions)`
`78`	`78`	`if err != nil {`