Skip to content

feat(api): add merge trains #1646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/api-objects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ API examples
gl_objects/boards
gl_objects/labels
gl_objects/notifications
gl_objects/merge_trains
gl_objects/mrs
gl_objects/mr_approvals
gl_objects/milestones
Expand Down
29 changes: 29 additions & 0 deletions docs/gl_objects/merge_trains.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
############
Merge Trains
############

Reference
---------

* v4 API:

+ :class:`gitlab.v4.objects.ProjectMergeTrain`
+ :class:`gitlab.v4.objects.ProjectMergeTrainManager`
+ :attr:`gitlab.v4.objects.Project.merge_trains`

* GitLab API: https://docs.gitlab.com/ee/api/merge_trains.html

Examples
--------

List merge trains for a project::

merge_trains = project.merge_trains.list()

List active merge trains for a project::

merge_trains = project.merge_trains.list(scope="active")

List completed (have been merged) merge trains for a project::

merge_trains = project.merge_trains.list(scope="complete")
1 change: 1 addition & 0 deletions gitlab/v4/objects/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from .members import *
from .merge_request_approvals import *
from .merge_requests import *
from .merge_trains import *
from .milestones import *
from .namespaces import *
from .notes import *
Expand Down
18 changes: 18 additions & 0 deletions gitlab/v4/objects/merge_trains.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from gitlab.base import RESTManager, RESTObject
from gitlab.mixins import ListMixin

__all__ = [
"ProjectMergeTrain",
"ProjectMergeTrainManager",
]


class ProjectMergeTrain(RESTObject):
pass


class ProjectMergeTrainManager(ListMixin, RESTManager):
_path = "/projects/%(project_id)s/merge_trains"
_obj_cls = ProjectMergeTrain
_from_parent_attrs = {"project_id": "id"}
_list_filters = "scope"
2 changes: 2 additions & 0 deletions gitlab/v4/objects/projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
ProjectApprovalRuleManager,
)
from .merge_requests import ProjectMergeRequestManager # noqa: F401
from .merge_trains import ProjectMergeTrainManager # noqa: F401
from .milestones import ProjectMilestoneManager # noqa: F401
from .notes import ProjectNoteManager # noqa: F401
from .notification_settings import ProjectNotificationSettingsManager # noqa: F401
Expand Down Expand Up @@ -141,6 +142,7 @@ class Project(RefreshMixin, SaveMixin, ObjectDeleteMixin, RepositoryMixin, RESTO
members: ProjectMemberManager
members_all: ProjectMemberAllManager
mergerequests: ProjectMergeRequestManager
merge_trains: ProjectMergeTrainManager
milestones: ProjectMilestoneManager
notes: ProjectNoteManager
notificationsettings: ProjectNotificationSettingsManager
Expand Down
65 changes: 65 additions & 0 deletions tests/unit/objects/test_merge_trains.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
"""
GitLab API:
https://docs.gitlab.com/ee/api/merge_trains.html
"""
import pytest
import responses

from gitlab.v4.objects import ProjectMergeTrain

mr_content = {
"id": 110,
"merge_request": {
"id": 1,
"iid": 1,
"project_id": 3,
"title": "Test merge train",
"description": "",
"state": "merged",
"created_at": "2020-02-06T08:39:14.883Z",
"updated_at": "2020-02-06T08:40:57.038Z",
"web_url": "http://gitlab.example.com/root/merge-train-race-condition/-/merge_requests/1",
},
"user": {
"id": 1,
"name": "Administrator",
"username": "root",
"state": "active",
"avatar_url": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
"web_url": "http://gitlab.example.com/root",
},
"pipeline": {
"id": 246,
"sha": "bcc17a8ffd51be1afe45605e714085df28b80b13",
"ref": "refs/merge-requests/1/train",
"status": "success",
"created_at": "2020-02-06T08:40:42.410Z",
"updated_at": "2020-02-06T08:40:46.912Z",
"web_url": "http://gitlab.example.com/root/merge-train-race-condition/pipelines/246",
},
"created_at": "2020-02-06T08:39:47.217Z",
"updated_at": "2020-02-06T08:40:57.720Z",
"target_branch": "feature-1580973432",
"status": "merged",
"merged_at": "2020-02-06T08:40:57.719Z",
"duration": 70,
}


@pytest.fixture
def resp_list_merge_trains():
with responses.RequestsMock() as rsps:
rsps.add(
method=responses.GET,
url="http://localhost/api/v4/projects/1/merge_trains",
json=[mr_content],
content_type="application/json",
status=200,
)
yield rsps


def test_list_project_merge_requests(project, resp_list_merge_trains):
merge_trains = project.merge_trains.list()
assert isinstance(merge_trains[0], ProjectMergeTrain)
assert merge_trains[0].id == mr_content["id"]