From b5c62f46a34f1d12783281c6df95e0bc8549d2c3 Mon Sep 17 00:00:00 2001
From: Yoann Schneider <yschneider@teklia.com>
Date: Mon, 29 Aug 2022 15:27:12 +0200
Subject: [PATCH] match post data sent
---
tests/test_git.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/test_git.py b/tests/test_git.py
index 63c5a871..0c78a456 100644
--- a/tests/test_git.py
+++ b/tests/test_git.py
@@ -4,6 +4,7 @@ from pathlib import Path
import pytest
from gitlab import GitlabCreateError, GitlabError
from requests import ConnectionError
+from responses import matchers
from arkindex_worker.git import GitlabHelper
@@ -222,6 +223,7 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
"state": "merged",
# several fields omitted
},
+ match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
)
# the fake_responses are defined in the same order as they are expected to be called
@@ -233,7 +235,6 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
gitlab_helper._wait_for_rebase_to_finish.return_value = True
success = gitlab_helper.merge(SOURCE_BRANCH, MR_TITLE)
-
assert success
assert len(fake_responses.calls) == 4
assert [c.request.method for c in fake_responses.calls] == expected_http_methods
@@ -258,6 +259,7 @@ def test_merge_request_fail(fake_responses, fake_gitlab_helper_factory, mocker):
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={"error": "Method not allowed"},
status=405,
+ match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
)
# the fake_responses are defined in the same order as they are expected to be called
@@ -346,6 +348,7 @@ def test_merge_request__success_after_errors(
"state": "merged",
# several fields omitted
},
+ match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
)
# the fake_responses are defined in the same order as they are expected to be called
--
GitLab