feat(functional): #2547 merge-train api for status and add mr - test data modifications

isaac-philip · JohnVillalovos · commit 775cd78ab2cb · 2025-06-07T08:04:51.000-07:00
Signed-off-by: Isaac Philip &lt;4974658+isaac-philip@users.noreply.github.com&gt;
diff --git a/gitlab/v4/objects/merge_trains.py b/gitlab/v4/objects/merge_trains.py
@@ -1,5 +1,5 @@
 from gitlab.base import RESTManager, RESTObject
-from gitlab.mixins import GetMixin, ListMixin, UpdateMethod, UpdateMixin
+from gitlab.mixins import CRUDMixin, GetMixin, ListMixin, UpdateMethod
 from gitlab.types import RequiredOptional
 
 __all__ = [
@@ -14,7 +14,7 @@ class ProjectMergeTrainMergeRequest(RESTObject):
     pass
 
 
-class ProjectMergeTrainMergeRequestManager(GetMixin, UpdateMixin, RESTManager):
+class ProjectMergeTrainMergeRequestManager(CRUDMixin, RESTManager):
     _path = "/projects/{project_id}/merge_trains/merge_requests"
     _obj_cls = ProjectMergeTrainMergeRequest
     _from_parent_attrs = {"project_id": "project_id"}
diff --git a/tests/unit/objects/test_merge_trains.py b/tests/unit/objects/test_merge_trains.py
@@ -11,7 +11,7 @@
 mr_content = {
     "id": 110,
     "merge_request": {
-        "id": 1,
+        "id": 273,
         "iid": 1,
         "project_id": 3,
         "title": "Test merge train",
@@ -47,7 +47,7 @@
 }
 
 merge_train_update = mr_content.copy()
-merge_train_update["id"] = 123
+merge_train_update["iid"] = 4
 merge_train_update["pipeline"]["sha"] = "ef33a3zxc3"
 
 
@@ -69,7 +69,7 @@ def resp_merge_trains_merge_request_get():
     with responses.RequestsMock() as rsps:
         rsps.add(
             method=responses.GET,
-            url="http://localhost/api/v4/projects/1/merge_trains/merge_requests/110",
+            url="http://localhost/api/v4/projects/1/merge_trains/merge_requests/1",
             json=mr_content,
             content_type="application/json",
             status=200,
@@ -82,7 +82,7 @@ def resp_merge_trains_merge_request_post():
     with responses.RequestsMock() as rsps:
         rsps.add(
             method=responses.POST,
-            url="http://localhost/api/v4/projects/1/merge_trains/merge_requests/123",
+            url="http://localhost/api/v4/projects/1/merge_trains/merge_requests/4",
             json=[merge_train_update],
             content_type="application/json",
             status=200,
@@ -96,24 +96,29 @@ def test_list_project_merge_requests(project, resp_list_merge_trains):
     assert merge_trains[0].id == mr_content["id"]
 
 
-def test_merge_trains_status_merge_request_get_status(
+def test_merge_trains_status_merge_request(
     project, resp_merge_trains_merge_request_get
 ):
     merge_train_mr: ProjectMergeTrainMergeRequest = project.merge_trains.get(
         1, lazy=True
-    ).merge_requests.get(110)
+    ).merge_requests.get(1)
     assert isinstance(merge_train_mr, ProjectMergeTrainMergeRequest)
     assert merge_train_mr.get_id() == 110
+    assert merge_train_mr.merge_request["iid"] == mr_content["merge_request"]["iid"]
     assert merge_train_mr.pipeline.get("status") == mr_content["pipeline"]["status"]
 
 
 def test_merge_train_add_merge_request(project, resp_merge_trains_merge_request_post):
     merge_train: ProjectMergeTrain = project.merge_trains.get(1, lazy=True)
     merge_requests_update = merge_train.merge_requests.update(
-        123, new_data={"sha": "ef33a3zxc3"}
+        4, new_data={"sha": "ef33a3zxc3"}
     )
     assert isinstance(merge_train, ProjectMergeTrain)
     assert (
         merge_requests_update[0]["pipeline"]["sha"]
         == merge_train_update["pipeline"]["sha"]
     )
+    assert (
+        merge_requests_update[0]["merge_request"]["iid"]
+        == merge_train_update["merge_request"]["iid"]
+    )
