Skip to content

Commit 8dd825c

Browse files
svanharmelensvanharmelen
authored
Merge pull request xanzy#1608 from VenuManikanta/master
2 parents 30ccfa2 + 4e6f4c1 commit 8dd825c

8 files changed

+64
-32
lines changed

‎commits_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ func TestCommitsService_ListMergeRequestsByCommit(t *testing.T) {
705705
"web_url": "https://gitlab.example.com/my-group/my-project/milestones/1"
706706
},
707707
"merge_when_pipeline_succeeds": true,
708-
"merge_status": "can_be_merged",
708+
"detailed_merge_status": "mergeable",
709709
"sha": "8888888888888888888888888888888888888888",
710710
"merge_commit_sha": null,
711711
"squash_commit_sha": null,
@@ -784,7 +784,7 @@ func TestCommitsService_ListMergeRequestsByCommit(t *testing.T) {
784784
State: "closed",
785785
WebURL: "https://gitlab.example.com/my-group/my-project/milestones/1"},
786786
MergeWhenPipelineSucceeds: true,
787-
MergeStatus: "can_be_merged",
787+
DetailedMergeStatus: "mergeable",
788788
MergeError: "",
789789
MergedBy: &BasicUser{
790790
ID: 87854,

‎deployments_merge_requests_test.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,21 @@ func TestDeploymentMergeRequestsService_ListDeploymentMergeRequests(t *testing.T
2929
require.Equal(t, 20, len(mergeRequests))
3030

3131
validStates := []string{"opened", "closed", "locked", "merged"}
32-
mergeStatuses := []string{"can_be_merged", "cannot_be_merged"}
32+
detailedMergeStatuses := []string{
33+
"blocked_status",
34+
"broken_status",
35+
"checking",
36+
"ci_must_pass",
37+
"ci_still_running",
38+
"discussions_not_resolved",
39+
"draft_status",
40+
"external_status_checks",
41+
"mergeable",
42+
"not_approved",
43+
"not_open",
44+
"policies_denied",
45+
"unchecked",
46+
}
3347
allCreatedBefore := time.Date(2019, 8, 21, 0, 0, 0, 0, time.UTC)
3448
allCreatedAfter := time.Date(2019, 8, 17, 0, 0, 0, 0, time.UTC)
3549

@@ -40,7 +54,7 @@ func TestDeploymentMergeRequestsService_ListDeploymentMergeRequests(t *testing.T
4054
assert.Greater(t, mr.CreatedAt.Unix(), allCreatedAfter.Unix())
4155
assert.LessOrEqual(t, mr.CreatedAt.Unix(), mr.UpdatedAt.Unix())
4256
assert.LessOrEqual(t, mr.TaskCompletionStatus.CompletedCount, mr.TaskCompletionStatus.Count)
43-
require.Contains(t, mergeStatuses, mr.MergeStatus)
57+
require.Contains(t, detailedMergeStatuses, mr.DetailedMergeStatus)
4458

4559
// list requests do not provide these fields:
4660
assert.Nil(t, mr.Pipeline)

‎group_milestones_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func TestGroupMilestonesService_GetGroupMilestoneMergeRequests(t *testing.T) {
403403
"web_url": "https://gitlab.example.com/my-group/my-project/milestones/1"
404404
},
405405
"merge_when_pipeline_succeeds": true,
406-
"merge_status": "can_be_merged",
406+
"detailed_merge_status": "mergeable",
407407
"sha": "8888888888888888888888888888888888888888",
408408
"merge_commit_sha": null,
409409
"squash_commit_sha": null,
@@ -482,7 +482,7 @@ func TestGroupMilestonesService_GetGroupMilestoneMergeRequests(t *testing.T) {
482482
State: "closed",
483483
WebURL: "https://gitlab.example.com/my-group/my-project/milestones/1"},
484484
MergeWhenPipelineSucceeds: true,
485-
MergeStatus: "can_be_merged",
485+
DetailedMergeStatus: "mergeable",
486486
MergeError: "",
487487
MergedBy: &BasicUser{
488488
ID: 87854,

‎merge_requests.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type MergeRequest struct {
5858
WorkInProgress bool `json:"work_in_progress"`
5959
Milestone *Milestone `json:"milestone"`
6060
MergeWhenPipelineSucceeds bool `json:"merge_when_pipeline_succeeds"`
61-
MergeStatus string `json:"merge_status"`
61+
DetailedMergeStatus string `json:"detailed_merge_status"`
6262
MergeError string `json:"merge_error"`
6363
MergedBy *BasicUser `json:"merged_by"`
6464
MergedAt *time.Time `json:"merged_at"`
@@ -107,6 +107,9 @@ type MergeRequest struct {
107107
HasConflicts bool `json:"has_conflicts"`
108108
BlockingDiscussionsResolved bool `json:"blocking_discussions_resolved"`
109109
Overflow bool `json:"overflow"`
110+
111+
// Deprecated members
112+
MergeStatus string `json:"merge_status"`
110113
}
111114

112115
func (m MergeRequest) String() string {

‎merge_requests_test.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func TestGetMergeRequest(t *testing.T) {
127127
"## What does this MR do?\r\n\r\nThis adds the capability to destroy/hide designs.")
128128
require.Equal(t, mergeRequest.WebURL,
129129
"https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14656")
130-
require.Equal(t, mergeRequest.MergeStatus, "can_be_merged")
130+
require.Equal(t, mergeRequest.DetailedMergeStatus, "mergeable")
131131
require.Equal(t, mergeRequest.Author, &ajk)
132132
require.Equal(t, mergeRequest.Assignee, &tk)
133133
require.Equal(t, mergeRequest.Assignees, []*BasicUser{&tk})
@@ -169,7 +169,21 @@ func TestListProjectMergeRequests(t *testing.T) {
169169
require.Equal(t, 20, len(mergeRequests))
170170

171171
validStates := []string{"opened", "closed", "locked", "merged"}
172-
mergeStatuses := []string{"can_be_merged", "cannot_be_merged"}
172+
detailedMergeStatuses := []string{
173+
"blocked_status",
174+
"broken_status",
175+
"checking",
176+
"ci_must_pass",
177+
"ci_still_running",
178+
"discussions_not_resolved",
179+
"draft_status",
180+
"external_status_checks",
181+
"mergeable",
182+
"not_approved",
183+
"not_open",
184+
"policies_denied",
185+
"unchecked",
186+
}
173187
allCreatedBefore := time.Date(2019, 8, 21, 0, 0, 0, 0, time.UTC)
174188
allCreatedAfter := time.Date(2019, 8, 17, 0, 0, 0, 0, time.UTC)
175189

@@ -180,7 +194,7 @@ func TestListProjectMergeRequests(t *testing.T) {
180194
assert.Greater(t, mr.CreatedAt.Unix(), allCreatedAfter.Unix())
181195
assert.LessOrEqual(t, mr.CreatedAt.Unix(), mr.UpdatedAt.Unix())
182196
assert.LessOrEqual(t, mr.TaskCompletionStatus.CompletedCount, mr.TaskCompletionStatus.Count)
183-
require.Contains(t, mergeStatuses, mr.MergeStatus)
197+
require.Contains(t, detailedMergeStatuses, mr.DetailedMergeStatus)
184198
// list requests do not provide these fields:
185199
assert.Nil(t, mr.Pipeline)
186200
assert.Nil(t, mr.HeadPipeline)

‎milestones_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func TestMilestonesService_GetMilestoneMergeRequests(t *testing.T) {
427427
"web_url": "https://gitlab.example.com/my-group/my-project/milestones/1"
428428
},
429429
"merge_when_pipeline_succeeds": true,
430-
"merge_status": "can_be_merged",
430+
"detailed_merge_status": "mergeable",
431431
"sha": "8888888888888888888888888888888888888888",
432432
"merge_commit_sha": null,
433433
"squash_commit_sha": null,
@@ -506,7 +506,7 @@ func TestMilestonesService_GetMilestoneMergeRequests(t *testing.T) {
506506
State: "closed",
507507
WebURL: "https://gitlab.example.com/my-group/my-project/milestones/1"},
508508
MergeWhenPipelineSucceeds: true,
509-
MergeStatus: "can_be_merged",
509+
DetailedMergeStatus: "mergeable",
510510
MergeError: "",
511511
MergedBy: &BasicUser{
512512
ID: 87854,

‎testdata/get_merge_request.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/35"
8181
},
8282
"merge_when_pipeline_succeeds": false,
83+
"detailed_merge_status": "mergeable",
8384
"merge_status": "can_be_merged",
8485
"sha": "8e0b45049b6253b8984cde9241830d2851168142",
8586
"merge_commit_sha": null,

‎testdata/get_merge_requests.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"work_in_progress": true,
6666
"milestone": null,
6767
"merge_when_pipeline_succeeds": false,
68-
"merge_status": "can_be_merged",
68+
"detailed_merge_status": "mergeable",
6969
"sha": "2fc4e8b972ff3208ec63b6143e34ad67ff343ad7",
7070
"merge_commit_sha": null,
7171
"discussion_locked": null,
@@ -160,7 +160,7 @@
160160
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
161161
},
162162
"merge_when_pipeline_succeeds": false,
163-
"merge_status": "can_be_merged",
163+
"detailed_merge_status": "mergeable",
164164
"sha": "dbb2b82236b86328f44a1754c9188c0991e707e5",
165165
"merge_commit_sha": null,
166166
"discussion_locked": null,
@@ -264,7 +264,7 @@
264264
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
265265
},
266266
"merge_when_pipeline_succeeds": false,
267-
"merge_status": "can_be_merged",
267+
"detailed_merge_status": "mergeable",
268268
"sha": "eae31acf34d2df2aba2ea469e432cab1c6a05b53",
269269
"merge_commit_sha": null,
270270
"discussion_locked": null,
@@ -357,7 +357,7 @@
357357
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
358358
},
359359
"merge_when_pipeline_succeeds": false,
360-
"merge_status": "cannot_be_merged",
360+
"detailed_merge_status": "broken_status",
361361
"sha": "fcf75b9330b1104bc08c0190cf871759db3f22e0",
362362
"merge_commit_sha": null,
363363
"discussion_locked": null,
@@ -433,7 +433,7 @@
433433
"work_in_progress": true,
434434
"milestone": null,
435435
"merge_when_pipeline_succeeds": false,
436-
"merge_status": "can_be_merged",
436+
"detailed_merge_status": "mergeable",
437437
"sha": "9af81f5ddb59a57d663c27bcb3144f8c0c26a7fd",
438438
"merge_commit_sha": null,
439439
"discussion_locked": null,
@@ -516,7 +516,7 @@
516516
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/35"
517517
},
518518
"merge_when_pipeline_succeeds": false,
519-
"merge_status": "can_be_merged",
519+
"detailed_merge_status": "mergeable",
520520
"sha": "54ac04bb0ec8849bf2ff43a949150d18008c8d35",
521521
"merge_commit_sha": null,
522522
"discussion_locked": null,
@@ -613,7 +613,7 @@
613613
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/35"
614614
},
615615
"merge_when_pipeline_succeeds": false,
616-
"merge_status": "can_be_merged",
616+
"detailed_merge_status": "mergeable",
617617
"sha": "de5099c8b64d118648c5fd9e381eadc30ae9b72d",
618618
"merge_commit_sha": null,
619619
"discussion_locked": null,
@@ -704,7 +704,7 @@
704704
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/35"
705705
},
706706
"merge_when_pipeline_succeeds": false,
707-
"merge_status": "can_be_merged",
707+
"detailed_merge_status": "mergeable",
708708
"sha": "846faa7dccc7e52f8d7af6b2fe1ca595340219a4",
709709
"merge_commit_sha": null,
710710
"discussion_locked": null,
@@ -799,7 +799,7 @@
799799
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
800800
},
801801
"merge_when_pipeline_succeeds": false,
802-
"merge_status": "can_be_merged",
802+
"detailed_merge_status": "mergeable",
803803
"sha": "de578529c00060f334b2b3e5aeda7e269d838a73",
804804
"merge_commit_sha": null,
805805
"discussion_locked": null,
@@ -899,7 +899,7 @@
899899
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
900900
},
901901
"merge_when_pipeline_succeeds": false,
902-
"merge_status": "can_be_merged",
902+
"detailed_merge_status": "mergeable",
903903
"sha": "34b3b319044987ba86af00b19ab5259d54aa8365",
904904
"merge_commit_sha": null,
905905
"discussion_locked": null,
@@ -973,7 +973,7 @@
973973
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/35"
974974
},
975975
"merge_when_pipeline_succeeds": false,
976-
"merge_status": "can_be_merged",
976+
"detailed_merge_status": "mergeable",
977977
"sha": "cba824ca33a199303091c2870e43f897574a3f0e",
978978
"merge_commit_sha": "6c3af2d1ce3c64bc559332b8b44dc3b33825781a",
979979
"discussion_locked": null,
@@ -1062,7 +1062,7 @@
10621062
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
10631063
},
10641064
"merge_when_pipeline_succeeds": false,
1065-
"merge_status": "can_be_merged",
1065+
"detailed_merge_status": "mergeable",
10661066
"sha": "2ea513d63d0b03a15d19e34a170e406f7ebab1a6",
10671067
"merge_commit_sha": null,
10681068
"discussion_locked": null,
@@ -1163,7 +1163,7 @@
11631163
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
11641164
},
11651165
"merge_when_pipeline_succeeds": false,
1166-
"merge_status": "can_be_merged",
1166+
"detailed_merge_status": "mergeable",
11671167
"sha": "2d3f756620c5de9785bf13a98b02d47c63a2ee1c",
11681168
"merge_commit_sha": null,
11691169
"discussion_locked": null,
@@ -1241,7 +1241,7 @@
12411241
"work_in_progress": false,
12421242
"milestone": null,
12431243
"merge_when_pipeline_succeeds": true,
1244-
"merge_status": "can_be_merged",
1244+
"detailed_merge_status": "mergeable",
12451245
"sha": "c7a107ac0148339a18250d73834c3c6eb869be12",
12461246
"merge_commit_sha": "aef47a865512652d02fa6552636de903cda13e11",
12471247
"discussion_locked": null,
@@ -1337,7 +1337,7 @@
13371337
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
13381338
},
13391339
"merge_when_pipeline_succeeds": false,
1340-
"merge_status": "can_be_merged",
1340+
"detailed_merge_status": "mergeable",
13411341
"sha": "35d5a9f48cbc4602c5920890ea2636dabf2e8cd1",
13421342
"merge_commit_sha": null,
13431343
"discussion_locked": null,
@@ -1420,7 +1420,7 @@
14201420
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
14211421
},
14221422
"merge_when_pipeline_succeeds": false,
1423-
"merge_status": "can_be_merged",
1423+
"detailed_merge_status": "mergeable",
14241424
"sha": "2aaa325ba6b725d04859a35da8beb666ba4bbc65",
14251425
"merge_commit_sha": null,
14261426
"discussion_locked": null,
@@ -1511,7 +1511,7 @@
15111511
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
15121512
},
15131513
"merge_when_pipeline_succeeds": false,
1514-
"merge_status": "can_be_merged",
1514+
"detailed_merge_status": "mergeable",
15151515
"sha": "2c935d51b83c5b4f50ca688d5cbbb771b0e378fc",
15161516
"merge_commit_sha": null,
15171517
"discussion_locked": null,
@@ -1589,7 +1589,7 @@
15891589
"work_in_progress": false,
15901590
"milestone": null,
15911591
"merge_when_pipeline_succeeds": false,
1592-
"merge_status": "can_be_merged",
1592+
"detailed_merge_status": "mergeable",
15931593
"sha": "21dd0530baefaa2e4bce5d8a9857bad829c51d64",
15941594
"merge_commit_sha": null,
15951595
"discussion_locked": null,
@@ -1663,7 +1663,7 @@
16631663
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
16641664
},
16651665
"merge_when_pipeline_succeeds": false,
1666-
"merge_status": "can_be_merged",
1666+
"detailed_merge_status": "mergeable",
16671667
"sha": "b2e35301e997a6b2eb7abacfb3943fd33532985c",
16681668
"merge_commit_sha": null,
16691669
"discussion_locked": null,
@@ -1746,7 +1746,7 @@
17461746
"web_url": "https://gitlab.com/groups/gitlab-org/-/milestones/37"
17471747
},
17481748
"merge_when_pipeline_succeeds": false,
1749-
"merge_status": "can_be_merged",
1749+
"detailed_merge_status": "mergeable",
17501750
"sha": "e3f350239176eb184accae9c4e380acda787cfbf",
17511751
"merge_commit_sha": null,
17521752
"discussion_locked": null,

0 commit comments

Comments
 (0)