Skip to content

Commit bec0a10

Browse files
cristiand391cristiand391
committed
Fix tests
1 parent bcab8c0 commit bec0a10

File tree

1 file changed

+71
-57
lines changed

1 file changed

+71
-57
lines changed

‎pkg/cmd/pr/merge/merge_test.go‎

Lines changed: 71 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,11 @@ func TestPrMerge(t *testing.T) {
257257
shared.RunCommandFinder(
258258
"1",
259259
&api.PullRequest{
260-
ID: "THE-ID",
261-
Number: 1,
262-
State: "OPEN",
263-
Title: "The title of the PR",
260+
ID: "THE-ID",
261+
Number: 1,
262+
State: "OPEN",
263+
Title: "The title of the PR",
264+
MergeStateStatus: "CLEAN",
264265
},
265266
baseRepo("OWNER", "REPO", "master"),
266267
)
@@ -295,10 +296,11 @@ func TestPrMerge_nontty(t *testing.T) {
295296
shared.RunCommandFinder(
296297
"1",
297298
&api.PullRequest{
298-
ID: "THE-ID",
299-
Number: 1,
300-
State: "OPEN",
301-
Title: "The title of the PR",
299+
ID: "THE-ID",
300+
Number: 1,
301+
State: "OPEN",
302+
Title: "The title of the PR",
303+
MergeStateStatus: "CLEAN",
302304
},
303305
baseRepo("OWNER", "REPO", "master"),
304306
)
@@ -330,10 +332,11 @@ func TestPrMerge_withRepoFlag(t *testing.T) {
330332
shared.RunCommandFinder(
331333
"1",
332334
&api.PullRequest{
333-
ID: "THE-ID",
334-
Number: 1,
335-
State: "OPEN",
336-
Title: "The title of the PR",
335+
ID: "THE-ID",
336+
Number: 1,
337+
State: "OPEN",
338+
Title: "The title of the PR",
339+
MergeStateStatus: "CLEAN",
337340
},
338341
baseRepo("OWNER", "REPO", "master"),
339342
)
@@ -368,11 +371,12 @@ func TestPrMerge_deleteBranch(t *testing.T) {
368371
shared.RunCommandFinder(
369372
"",
370373
&api.PullRequest{
371-
ID: "PR_10",
372-
Number: 10,
373-
State: "OPEN",
374-
Title: "Blueberries are a good fruit",
375-
HeadRefName: "blueberries",
374+
ID: "PR_10",
375+
Number: 10,
376+
State: "OPEN",
377+
Title: "Blueberries are a good fruit",
378+
HeadRefName: "blueberries",
379+
MergeStateStatus: "CLEAN",
376380
},
377381
baseRepo("OWNER", "REPO", "master"),
378382
)
@@ -414,11 +418,12 @@ func TestPrMerge_deleteNonCurrentBranch(t *testing.T) {
414418
shared.RunCommandFinder(
415419
"blueberries",
416420
&api.PullRequest{
417-
ID: "PR_10",
418-
Number: 10,
419-
State: "OPEN",
420-
Title: "Blueberries are a good fruit",
421-
HeadRefName: "blueberries",
421+
ID: "PR_10",
422+
Number: 10,
423+
State: "OPEN",
424+
Title: "Blueberries are a good fruit",
425+
HeadRefName: "blueberries",
426+
MergeStateStatus: "CLEAN",
422427
},
423428
baseRepo("OWNER", "REPO", "master"),
424429
)
@@ -457,10 +462,11 @@ func Test_nonDivergingPullRequest(t *testing.T) {
457462
defer http.Verify(t)
458463

459464
pr := &api.PullRequest{
460-
ID: "PR_10",
461-
Number: 10,
462-
Title: "Blueberries are a good fruit",
463-
State: "OPEN",
465+
ID: "PR_10",
466+
Number: 10,
467+
Title: "Blueberries are a good fruit",
468+
State: "OPEN",
469+
MergeStateStatus: "CLEAN",
464470
}
465471
stubCommit(pr, "COMMITSHA1")
466472

@@ -495,10 +501,11 @@ func Test_divergingPullRequestWarning(t *testing.T) {
495501
defer http.Verify(t)
496502

497503
pr := &api.PullRequest{
498-
ID: "PR_10",
499-
Number: 10,
500-
Title: "Blueberries are a good fruit",
501-
State: "OPEN",
504+
ID: "PR_10",
505+
Number: 10,
506+
Title: "Blueberries are a good fruit",
507+
State: "OPEN",
508+
MergeStateStatus: "CLEAN",
502509
}
503510
stubCommit(pr, "COMMITSHA1")
504511

@@ -536,10 +543,11 @@ func Test_pullRequestWithoutCommits(t *testing.T) {
536543
shared.RunCommandFinder(
537544
"",
538545
&api.PullRequest{
539-
ID: "PR_10",
540-
Number: 10,
541-
Title: "Blueberries are a good fruit",
542-
State: "OPEN",
546+
ID: "PR_10",
547+
Number: 10,
548+
Title: "Blueberries are a good fruit",
549+
State: "OPEN",
550+
MergeStateStatus: "CLEAN",
543551
},
544552
baseRepo("OWNER", "REPO", "master"),
545553
)
@@ -572,10 +580,11 @@ func TestPrMerge_rebase(t *testing.T) {
572580
shared.RunCommandFinder(
573581
"2",
574582
&api.PullRequest{
575-
ID: "THE-ID",
576-
Number: 2,
577-
Title: "The title of the PR",
578-
State: "OPEN",
583+
ID: "THE-ID",
584+
Number: 2,
585+
Title: "The title of the PR",
586+
State: "OPEN",
587+
MergeStateStatus: "CLEAN",
579588
},
580589
baseRepo("OWNER", "REPO", "master"),
581590
)
@@ -610,10 +619,11 @@ func TestPrMerge_squash(t *testing.T) {
610619
shared.RunCommandFinder(
611620
"3",
612621
&api.PullRequest{
613-
ID: "THE-ID",
614-
Number: 3,
615-
Title: "The title of the PR",
616-
State: "OPEN",
622+
ID: "THE-ID",
623+
Number: 3,
624+
Title: "The title of the PR",
625+
State: "OPEN",
626+
MergeStateStatus: "CLEAN",
617627
},
618628
baseRepo("OWNER", "REPO", "master"),
619629
)
@@ -647,11 +657,12 @@ func TestPrMerge_alreadyMerged(t *testing.T) {
647657
shared.RunCommandFinder(
648658
"4",
649659
&api.PullRequest{
650-
ID: "THE-ID",
651-
Number: 4,
652-
State: "MERGED",
653-
HeadRefName: "blueberries",
654-
BaseRefName: "master",
660+
ID: "THE-ID",
661+
Number: 4,
662+
State: "MERGED",
663+
HeadRefName: "blueberries",
664+
BaseRefName: "master",
665+
MergeStateStatus: "CLEAN",
655666
},
656667
baseRepo("OWNER", "REPO", "master"),
657668
)
@@ -684,6 +695,7 @@ func TestPrMerge_alreadyMerged_nonInteractive(t *testing.T) {
684695
Number: 4,
685696
State: "MERGED",
686697
HeadRepositoryOwner: api.Owner{Login: "monalisa"},
698+
MergeStateStatus: "CLEAN",
687699
},
688700
baseRepo("OWNER", "REPO", "master"),
689701
)
@@ -707,10 +719,11 @@ func TestPRMerge_interactive(t *testing.T) {
707719
shared.RunCommandFinder(
708720
"",
709721
&api.PullRequest{
710-
ID: "THE-ID",
711-
Number: 3,
712-
Title: "It was the best of times",
713-
HeadRefName: "blueberries",
722+
ID: "THE-ID",
723+
Number: 3,
724+
Title: "It was the best of times",
725+
HeadRefName: "blueberries",
726+
MergeStateStatus: "CLEAN",
714727
},
715728
baseRepo("OWNER", "REPO", "master"),
716729
)
@@ -757,10 +770,11 @@ func TestPRMerge_interactiveWithDeleteBranch(t *testing.T) {
757770
shared.RunCommandFinder(
758771
"",
759772
&api.PullRequest{
760-
ID: "THE-ID",
761-
Number: 3,
762-
Title: "It was the best of times",
763-
HeadRefName: "blueberries",
773+
ID: "THE-ID",
774+
Number: 3,
775+
Title: "It was the best of times",
776+
HeadRefName: "blueberries",
777+
MergeStateStatus: "CLEAN",
764778
},
765779
baseRepo("OWNER", "REPO", "master"),
766780
)
@@ -859,7 +873,7 @@ func TestPRMerge_interactiveSquashEditCommitMsg(t *testing.T) {
859873
InteractiveMode: true,
860874
Finder: shared.NewMockFinder(
861875
"https://github.com/OWNER/REPO/pull/123",
862-
&api.PullRequest{ID: "THE-ID", Number: 123, Title: "title"},
876+
&api.PullRequest{ID: "THE-ID", Number: 123, Title: "title", MergeStateStatus: "CLEAN"},
863877
ghrepo.New("OWNER", "REPO"),
864878
),
865879
})
@@ -875,7 +889,7 @@ func TestPRMerge_interactiveCancelled(t *testing.T) {
875889

876890
shared.RunCommandFinder(
877891
"",
878-
&api.PullRequest{ID: "THE-ID", Number: 123},
892+
&api.PullRequest{ID: "THE-ID", Number: 123, MergeStateStatus: "CLEAN"},
879893
ghrepo.New("OWNER", "REPO"),
880894
)
881895

0 commit comments

Comments
 (0)