@@ -31,9 +31,6 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
3131 object MergeWhenPipelineSucceedsMatcher
3232 extends QueryParamDecoderMatcher [Boolean ](" merge_when_pipeline_succeeds" )
3333
34- object ShouldRemoveSourceBranchMatcher
35- extends QueryParamDecoderMatcher [Boolean ](" should_remove_source_branch" )
36-
3734 object RequiredReviewersMatcher extends QueryParamDecoderMatcher [Int ](" approvals_required" )
3835
3936 object UsernameMatcher extends QueryParamDecoderMatcher [String ](" username" )
@@ -91,7 +88,7 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
9188 )
9289
9390 case PUT -> Root / " projects" / " foo/bar" / " merge_requests" / " 150" / " merge"
94- :? MergeWhenPipelineSucceedsMatcher (_) +& ShouldRemoveSourceBranchMatcher (_) =>
91+ :? MergeWhenPipelineSucceedsMatcher (_) =>
9592 Ok (
9693 getMr.deepMerge(
9794 json """ { "iid": 150, "web_url": "https://gitlab.com/foo/bar/merge_requests/150" } """
@@ -143,12 +140,12 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
143140 user
144141 )
145142
146- private val gitlabApiAlgAutoMergeAndRemoveSourceBranch = ForgeSelection .forgeApiAlg[MockEff ](
143+ private val gitlabApiAlgAutoMerge = ForgeSelection .forgeApiAlg[MockEff ](
147144 config.forgeCfg.copy(tpe = ForgeType .GitLab , doNotFork = true ),
148145 GitLabCfg (
149146 mergeWhenPipelineSucceeds = true ,
150147 requiredReviewers = None ,
151- removeSourceBranch = true
148+ removeSourceBranch = false
152149 ),
153150 user
154151 )
@@ -270,8 +267,8 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
270267 assertIO(prOut, expected)
271268 }
272269
273- test(" createPullRequest -- auto merge and remove source branch " ) {
274- val prOut = gitlabApiAlgAutoMergeAndRemoveSourceBranch
270+ test(" createPullRequest -- auto merge" ) {
271+ val prOut = gitlabApiAlgAutoMerge
275272 .createPullRequest(Repo (" foo" , " bar" ), newPRData)
276273 .runA(state)
277274
0 commit comments