Skip to content
Snippets Groups Projects
Verified Commit 38f214c4 authored by Yoann Schneider's avatar Yoann Schneider :tennis:
Browse files

should_remove_branch parameter is no longer specified in url

parent a7ad1a74
No related branches found
No related tags found
1 merge request!112Bump Python requirement python-gitlab to 3.9.0
...@@ -216,7 +216,7 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker): ...@@ -216,7 +216,7 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
fake_responses.add( fake_responses.add(
fake_responses.PUT, fake_responses.PUT,
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True", f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={ json={
"iid": MERGE_REQUEST_ID, "iid": MERGE_REQUEST_ID,
"state": "merged", "state": "merged",
...@@ -255,7 +255,7 @@ def test_merge_request_fail(fake_responses, fake_gitlab_helper_factory, mocker): ...@@ -255,7 +255,7 @@ def test_merge_request_fail(fake_responses, fake_gitlab_helper_factory, mocker):
fake_responses.add( fake_responses.add(
fake_responses.PUT, fake_responses.PUT,
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True", f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={"error": "Method not allowed"}, json={"error": "Method not allowed"},
status=405, status=405,
) )
...@@ -340,7 +340,7 @@ def test_merge_request__success_after_errors( ...@@ -340,7 +340,7 @@ def test_merge_request__success_after_errors(
fake_responses.add( fake_responses.add(
fake_responses.PUT, fake_responses.PUT,
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True", f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={ json={
"iid": MERGE_REQUEST_ID, "iid": MERGE_REQUEST_ID,
"state": "merged", "state": "merged",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment