fix: BranchMergeServiceTest (#3425)

bdshadow · dkrizan · commit ec2510bad7cf · 2026-01-28T17:40:20.000+01:00
diff --git a/ee/backend/tests/src/test/kotlin/io/tolgee/ee/service/branching/BranchMergeServiceTest.kt b/ee/backend/tests/src/test/kotlin/io/tolgee/ee/service/branching/BranchMergeServiceTest.kt
@@ -207,6 +207,7 @@ class BranchMergeServiceTest : AbstractSpringTest() {
   }
 
   @Test
+  @Transactional
   fun `apply merge - keeps branch and resets snapshot`() {
     val merge = prepareMergeScenario()
     branchService.applyMerge(testData.project.id, merge.id, false)

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@ class BranchMergeServiceTest : AbstractSpringTest() {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`@Test`
	`210`	`+ @Transactional`
`210`	`211`	fun `apply merge - keeps branch and resets snapshot`() {
`211`	`212`	`val merge = prepareMergeScenario()`
`212`	`213`	`branchService.applyMerge(testData.project.id, merge.id, false)`