From 38f214c448ea04291ba3f5edc20d8aa8e0d099c1 Mon Sep 17 00:00:00 2001
From: Yoann Schneider <yschneider@teklia.com>
Date: Mon, 29 Aug 2022 14:57:31 +0200
Subject: [PATCH] should_remove_branch parameter is no longer specified in url
---
tests/test_git.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/test_git.py b/tests/test_git.py
index 1a9f4388..63c5a871 100644
--- a/tests/test_git.py
+++ b/tests/test_git.py
@@ -216,7 +216,7 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
fake_responses.add(
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={
"iid": MERGE_REQUEST_ID,
"state": "merged",
@@ -255,7 +255,7 @@ def test_merge_request_fail(fake_responses, fake_gitlab_helper_factory, mocker):
fake_responses.add(
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"},
status=405,
)
@@ -340,7 +340,7 @@ def test_merge_request__success_after_errors(
fake_responses.add(
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={
"iid": MERGE_REQUEST_ID,
"state": "merged",
--
GitLab