Merge pull request #385 from ferhat-aram/fix/merge-request-arguments

GitLab: merge with correct arguments
pyupio · Dec 27, 2020 · 358166d · 358166d
2 parents 5972a1b + 3d5074e
commit 358166d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -6,6 +6,9 @@ History
 1.1.2a (current)
 ----------------
 * Current unstable
+* Fixed `#384`_ affecting GitLab automatic merge
+
+.. _#384: https://github.com/pyupio/pyup/issues/384
 
 1.1.1 (2020-05-01)
 ------------------

diff --git a/pyup/providers/gitlab.py b/pyup/providers/gitlab.py
@@ -171,7 +171,7 @@ def close_pull_request(self, bot_repo, user_repo, pull_request, comment, prefix)
         self.delete_branch(user_repo, source_branch, prefix)
 
     def _merge_merge_request(self, mr, config):
-        mr.merge(remove_source_branch=config.gitlab.should_remove_source_branch,
+        mr.merge(should_remove_source_branch=config.gitlab.should_remove_source_branch,
                  merge_when_pipeline_succeeds=True)
 
     def create_pull_request(self, repo, title, body, base_branch, new_branch, pr_label, assignees, config):

diff --git a/tests/test_gitlab.py b/tests/test_gitlab.py
@@ -211,7 +211,7 @@ def test_merge_pull_request(self):
         config = Config()
         self.provider._merge_merge_request(mr, config)
         mr.merge.assert_called_once_with(merge_when_pipeline_succeeds=True,
-                                         remove_source_branch=False)
+                                         should_remove_source_branch=False)
 
     def test_merge_pull_request_with_remove(self):
         mr = Mock()
@@ -220,7 +220,7 @@ def test_merge_pull_request_with_remove(self):
         config.update_config({'gitlab': {'should_remove_source_branch': True}})
         self.provider._merge_merge_request(mr, config)
         mr.merge.assert_called_once_with(merge_when_pipeline_succeeds=True,
-                                         remove_source_branch=True)
+                                         should_remove_source_branch=True)
 
     def test_create_pull_request_with_exceeding_body(self):
         body = ''.join(["a" for i in range(0, 65536 + 1)])