1111mr_content = {
1212"id" :110 ,
1313"merge_request" : {
14- "id" :1 ,
14+ "id" :273 ,
1515"iid" :1 ,
1616"project_id" :3 ,
1717"title" :"Test merge train" ,
4747}
4848
4949merge_train_update = mr_content .copy ()
50- merge_train_update ["id " ]= 123
50+ merge_train_update ["iid " ]= 4
5151merge_train_update ["pipeline" ]["sha" ]= "ef33a3zxc3"
5252
5353
@@ -69,7 +69,7 @@ def resp_merge_trains_merge_request_get():
6969with responses .RequestsMock ()as rsps :
7070rsps .add (
7171method = responses .GET ,
72- url = "http://localhost/api/v4/projects/1/merge_trains/merge_requests/110 " ,
72+ url = "http://localhost/api/v4/projects/1/merge_trains/merge_requests/1 " ,
7373json = mr_content ,
7474content_type = "application/json" ,
7575status = 200 ,
@@ -82,7 +82,7 @@ def resp_merge_trains_merge_request_post():
8282with responses .RequestsMock ()as rsps :
8383rsps .add (
8484method = responses .POST ,
85- url = "http://localhost/api/v4/projects/1/merge_trains/merge_requests/123 " ,
85+ url = "http://localhost/api/v4/projects/1/merge_trains/merge_requests/4 " ,
8686json = [merge_train_update ],
8787content_type = "application/json" ,
8888status = 200 ,
@@ -96,24 +96,29 @@ def test_list_project_merge_requests(project, resp_list_merge_trains):
9696assert merge_trains [0 ].id == mr_content ["id" ]
9797
9898
99- def test_merge_trains_status_merge_request_get_status (
99+ def test_merge_trains_status_merge_request (
100100project ,resp_merge_trains_merge_request_get
101101):
102102merge_train_mr :ProjectMergeTrainMergeRequest = project .merge_trains .get (
1031031 ,lazy = True
104- ).merge_requests .get (110 )
104+ ).merge_requests .get (1 )
105105assert isinstance (merge_train_mr ,ProjectMergeTrainMergeRequest )
106106assert merge_train_mr .get_id ()== 110
107+ assert merge_train_mr .merge_request ["iid" ]== mr_content ["merge_request" ]["iid" ]
107108assert merge_train_mr .pipeline .get ("status" )== mr_content ["pipeline" ]["status" ]
108109
109110
110111def test_merge_train_add_merge_request (project ,resp_merge_trains_merge_request_post ):
111112merge_train :ProjectMergeTrain = project .merge_trains .get (1 ,lazy = True )
112113merge_requests_update = merge_train .merge_requests .update (
113- 123 ,new_data = {"sha" :"ef33a3zxc3" }
114+ 4 ,new_data = {"sha" :"ef33a3zxc3" }
114115 )
115116assert isinstance (merge_train ,ProjectMergeTrain )
116117assert (
117118merge_requests_update [0 ]["pipeline" ]["sha" ]
118119== merge_train_update ["pipeline" ]["sha" ]
119120 )
121+ assert (
122+ merge_requests_update [0 ]["merge_request" ]["iid" ]
123+ == merge_train_update ["merge_request" ]["iid" ]
124+ )