11package io.tolgee.ee.service.branching
22
33import io.tolgee.AbstractSpringTest
4- import io.tolgee.constants.Caches
54import io.tolgee.development.testDataBuilder.data.BranchMergeTestData
65import io.tolgee.dtos.request.LanguageRequest
76import io.tolgee.dtos.request.key.CreateKeyDto
8- import io.tolgee.ee.repository.EeSubscriptionRepository
7+ import io.tolgee.ee.service.eeSubscription.EeSubscriptionServiceImpl
98import io.tolgee.ee.repository.TaskRepository
109import io.tolgee.ee.repository.branching.BranchRepository
1110import io.tolgee.ee.service.LabelServiceImpl
@@ -62,7 +61,7 @@ class BranchMergeServiceTest : AbstractSpringTest() {
6261 lateinit var keyScreenshotReferenceRepository: KeyScreenshotReferenceRepository
6362
6463 @Autowired
65- lateinit var eeSubscriptionRepository : EeSubscriptionRepository
64+ lateinit var eeSubscriptionServiceImpl : EeSubscriptionServiceImpl
6665
6766 private lateinit var testData: BranchMergeTestData
6867
@@ -73,9 +72,7 @@ class BranchMergeServiceTest : AbstractSpringTest() {
7372 @BeforeEach
7473 fun setup () {
7574 // Clear any existing subscription to avoid key limit issues from other tests
76- executeInNewTransaction {
77- eeSubscriptionRepository.deleteAll()
78- }
75+ eeSubscriptionServiceImpl.delete()
7976 testData = BranchMergeTestData ()
8077 testDataService.saveTestData(testData.root)
8178 branchSnapshotService.createInitialSnapshot(
0 commit comments