test(cy): use cy.getContent and more compact syntax

Signed-off-by: Max <max@nextcloud.com>
nextcloud · Jul 24, 2024 · 144b227 · 144b227
1 parent 3fd2093
commit 144b227
Showing 1 changed file with 13 additions and 27 deletions.
diff --git a/cypress/e2e/conflict.spec.js b/cypress/e2e/conflict.spec.js
@@ -30,11 +30,8 @@ variants.forEach(function({ fixture, mime }) {
 			cy.uploadFile('frontmatter.md', mime, fileName)
 			// just a read only session opened
 			cy.shareFile(`/${fileName}`)
-				.then((token) => {
-					cy.visit(`/s/${token}`)
-				})
-			cy.get('.text-editor__main')
-				.should('contain', 'Heading')
+				.then(token => cy.visit(`/s/${token}`))
+			cy.getContent().should('contain', 'Heading')
 			cy.intercept({ method: 'POST', url: '**/session/*/push' })
 				.as('push')
 			cy.wait('@push')
@@ -45,12 +42,9 @@ variants.forEach(function({ fixture, mime }) {
 			cy.get('#editor-container .document-status a.button')
 				.contains('Reload')
 				.click()
-			getWrapper()
-				.should('not.exist')
-			cy.getContent()
-				.should('contain', 'Hello world')
-			cy.getContent()
-				.should('not.contain', 'Heading')
+			getWrapper().should('not.exist')
+			cy.getContent().should('contain', 'Hello world')
+			cy.getContent().should('not.contain', 'Heading')
 		})
 
 		it('displays conflicts', function() {
@@ -77,14 +71,11 @@ variants.forEach(function({ fixture, mime }) {
 			cy.openFile(fileName)
 			cy.get('[data-cy="resolveThisVersion"]').click()
 
-			getWrapper()
-				.should('not.exist')
+			getWrapper().should('not.exist')
 			cy.get('[data-cy="resolveThisVersion"]')
 				.should('not.exist')
-			cy.get('.text-editor__main')
-				.should('contain', 'Hello world')
-			cy.get('.text-editor__main')
-				.should('contain', 'cruel conflicting')
+			cy.getContent().should('contain', 'Hello world')
+			cy.getContent().should('contain', 'cruel conflicting')
 		})
 
 		it('resolves conflict using server version', function() {
@@ -94,16 +85,13 @@ variants.forEach(function({ fixture, mime }) {
 			cy.get('[data-cy="resolveServerVersion"]')
 				.click()
 
-			getWrapper()
-				.should('not.exist')
+			getWrapper().should('not.exist')
 			cy.get('[data-cy="resolveThisVersion"]')
 				.should('not.exist')
 			cy.get('[data-cy="resolveServerVersion"]')
 				.should('not.exist')
-			cy.get('.text-editor__main')
-				.should('contain', 'Hello world')
-			cy.get('.text-editor__main')
-				.should('not.contain', 'cruel conflicting')
+			cy.getContent().should('contain', 'Hello world')
+			cy.getContent().should('not.contain', 'cruel conflicting')
 		})
 
 		it('hides conflict in read only session', function() {
@@ -113,10 +101,8 @@ variants.forEach(function({ fixture, mime }) {
 					cy.logout()
 					cy.visit(`/s/${token}`)
 				})
-			cy.get('.text-editor__main')
-				.should('contain', 'cruel conflicting')
-			getWrapper()
-				.should('not.exist')
+			cy.getContent().should('contain', 'cruel conflicting')
+			getWrapper().should('not.exist')
 		})
 
 	})