Merge pull request #3988 from nextcloud/backport/3972/stable26

[stable26] Conflict fixes

Author: mejo-

cypress/e2e/conflict.spec.js

@@ -60,4 +60,81 @@ describe('Open test.md in viewer', function() {
 			.should('contain', 'cruel conflicting')
 		cy.screenshot()
 	})
+
+	it('resolves conflict using current editing session', function() {
+		cy.openFile(fileName)
+
+		cy.log('Inspect editor')
+		cy.getContent()
+			.type('Hello you cruel conflicting world')
+		cy.uploadFile('test.md', 'text/markdown')
+
+		cy.get('#viewer .modal-header button.header-close').click()
+		cy.get('#viewer').should('not.exist')
+		cy.openFile('test.md')
+		cy.get('.text-editor .document-status .icon-error')
+		getWrapper()
+			.get('#read-only-editor h2')
+			.should('contain', 'Hello world')
+		getWrapper()
+			.get('.text-editor__main h2')
+			.should('contain', 'Hello world')
+		getWrapper()
+			.get('.text-editor__main')
+			.should('contain', 'cruel conflicting')
+
+		cy.get('[data-cy="resolveThisVersion"]').click()
+
+		getWrapper()
+			.get('#read-only-editor')
+			.should('not.exist')
+
+		cy.get('[data-cy="resolveThisVersion"]')
+			.should('not.exist')
+
+		cy.get('.text-editor__main h2')
+			.should('contain', 'Hello world')
+		cy.get('.text-editor__main')
+			.should('contain', 'cruel conflicting')
+	})
+
+	it('resolves conflict using server version', function() {
+		cy.openFile(fileName)
+
+		cy.log('Inspect editor')
+		cy.getContent()
+			.type('Hello you cruel conflicting world')
+		cy.uploadFile('test.md', 'text/markdown')
+
+		cy.get('#viewer .modal-header button.header-close').click()
+		cy.get('#viewer').should('not.exist')
+		cy.openFile('test.md')
+		cy.get('.text-editor .document-status .icon-error')
+		getWrapper()
+			.get('#read-only-editor h2')
+			.should('contain', 'Hello world')
+		getWrapper()
+			.get('.text-editor__main h2')
+			.should('contain', 'Hello world')
+		getWrapper()
+			.get('.text-editor__main')
+			.should('contain', 'cruel conflicting')
+
+		getWrapper()
+			.get('[data-cy="resolveServerVersion"]')
+			.click()
+
+		getWrapper()
+			.get('#read-only-editor')
+			.should('not.exist')
+		cy.get('[data-cy="resolveThisVersion"]')
+			.should('not.exist')
+		cy.get('[data-cy="resolveServerVersion"]')
+			.should('not.exist')
+
+		cy.get('.text-editor__main h2')
+			.should('contain', 'Hello world')
+		cy.get('.text-editor__main')
+			.should('not.contain', 'cruel conflicting')
+	})
 })