From a591476c9e65a5cee4868b008b8f79ee03d4b0b8 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 10 Nov 2021 13:15:20 +0100 Subject: Fix gitlab squash merge In previous change support for the gitlab merge was added, but the parameters dict was not properly passed to the invocation method. Fix this now and add corresponding test. Change-Id: I781c02848abc524ca98e03984539507b769d19fe --- tests/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/base.py') diff --git a/tests/base.py b/tests/base.py index 504a9718d..691877339 100644 --- a/tests/base.py +++ b/tests/base.py @@ -2103,6 +2103,7 @@ class FakeGitlabMergeRequest(object): self.state = 'opened' self.is_merged = False self.merge_status = 'can_be_merged' + self.squash_merge = None self.labels = [] self.notes = [] self.url = "https://%s/%s/merge_requests/%s" % ( @@ -2141,9 +2142,10 @@ class FakeGitlabMergeRequest(object): self.state = 'closed' self._updateTimeStamp() - def mergeMergeRequest(self): + def mergeMergeRequest(self, squash=None): self.state = 'merged' self.is_merged = True + self.squash_merge = squash self._updateTimeStamp() self.merged_at = self.updated_at -- cgit v1.2.1