diff --git a/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js b/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js index bdc760cf2f..f3ba975d77 100644 --- a/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js +++ b/Tests/IntegrationTests/Fixtures/1Dimension/syncing.e2e.js @@ -21,7 +21,6 @@ test('Syncing: Create a conflict state between two editors and choose "Discard a await prepareContentElementConflictBetweenAdminAndEditor(t); await chooseDiscardAllAsResolutionStrategy(t); await confirmAndPerformDiscardAll(t); - await finishSynchronization(t); await assertThatWeAreOnPage(t, 'Home'); await assertThatWeCannotSeePageInTree(t, 'Sync Demo #1'); @@ -62,7 +61,6 @@ test('Syncing: Create a conflict state between two editors and choose "Drop conf await cancelDropConflictingChanges(t); await chooseDiscardAllAsResolutionStrategy(t); await confirmAndPerformDiscardAll(t); - await finishSynchronization(t); await assertThatWeAreOnPage(t, 'Home'); await assertThatWeCannotSeePageInTree(t, 'Sync Demo #1'); diff --git a/packages/neos-ui-sagas/src/Sync/index.ts b/packages/neos-ui-sagas/src/Sync/index.ts index a6f2fca4ab..4bac01877c 100644 --- a/packages/neos-ui-sagas/src/Sync/index.ts +++ b/packages/neos-ui-sagas/src/Sync/index.ts @@ -92,7 +92,7 @@ export const makeSyncPersonalWorkspace = (deps: { export const makeResolveConflicts = (deps: { syncPersonalWorkspace: ReturnType }) => { - const discardAll = makeDiscardAll(deps); + const discardAll = makeDiscardAll(); function * resolveConflicts(conflicts: Conflict[]): any { while (true) { @@ -155,16 +155,14 @@ function * waitForRetry() { return Boolean(retried); } -const makeDiscardAll = (deps: { - syncPersonalWorkspace: ReturnType; -}) => { +const makeDiscardAll = () => { function * discardAll() { yield put(actions.CR.Publishing.start( PublishingMode.DISCARD, PublishingScope.ALL )); - const {cancelled, failed}: { + const {cancelled}: { cancelled: null | ReturnType; failed: null | ReturnType; finished: null | ReturnType; @@ -176,12 +174,8 @@ const makeDiscardAll = (deps: { if (cancelled) { yield put(actions.CR.Syncing.cancelResolution()); - } else if (failed) { - yield put(actions.CR.Syncing.finish()); - } else { - yield put(actions.CR.Syncing.confirmResolution()); - yield * deps.syncPersonalWorkspace(false); } + yield put(actions.CR.Syncing.finish()); } return discardAll;