chore(cypress): Fix tests

Signed-off-by: Christopher Ng <[email protected]>
nextcloud · Feb 8, 2024 · 976b830 · 976b830
1 parent 4538aa8
commit 976b830
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/cypress/e2e/nodes/Table.spec.js b/cypress/e2e/nodes/Table.spec.js
@@ -40,9 +40,9 @@ describe('table plugin', () => {
 			.should('contain', 'content')
 
 		cy.getContent()
-			.find('[data-text-table-actions="settings"]').click()
+			.find('[data-text-table-actions="settings"] [aria-label="Actions"]').click()
 
-		cy.get('[data-text-table-action="delete"]').click()
+		cy.get('[data-text-table-action="delete"] [role="menuitem"]').click()
 		cy.getContent()
 			.should('not.contain', 'content')
 	})
@@ -80,7 +80,7 @@ describe('table plugin', () => {
 			cy.getContent()
 				.find('table tr:first-child th:first-child button')
 				.click()
-			cy.get(`[data-text-table-action="align-column-${align}"]`)
+			cy.get(`[data-text-table-action="align-column-${align}"] [role="menuitemradio"]`)
 				.click()
 			// Check header has correct text align and text is preserved
 			cy.getContent()
@@ -101,7 +101,7 @@ describe('table plugin', () => {
 		cy.getContent()
 			.find('table tr:first-child th:first-child button')
 			.click()
-		cy.get('[data-text-table-action="align-column-center"]')
+		cy.get('[data-text-table-action="align-column-center"] [role="menuitemradio"]')
 			.click()
 
 		// Test before adding a row

diff --git a/cypress/e2e/versions.spec.js b/cypress/e2e/versions.spec.js
@@ -26,19 +26,19 @@ describe('Versions', () => {
 			cy.get('[data-cy-files-list-row-name="' + versionFileName + '"] [data-cy-files-list-row-mtime]').click()
 			cy.get('.app-sidebar-header').should('be.visible').should('contain', versionFileName)
 			cy.get('.app-sidebar-tabs__tab:contains("Versions")').click()
-			cy.get('[data-files-versions-versions-list] li > a').should('have.length', 3)
+			cy.get('[data-files-versions-versions-list] li a').should('have.length', 3)
 
-			cy.get('[data-files-versions-versions-list] li > a').eq(1).click()
+			cy.get('[data-files-versions-versions-list] li a').eq(1).click()
 			cy.get('.viewer__content #read-only-editor')
 				.find('h1 [data-node-view-content]')
 				.should('have.text', 'V2')
 
-			cy.get('[data-files-versions-versions-list] li > a').eq(2).click()
+			cy.get('[data-files-versions-versions-list] li a').eq(2).click()
 			cy.get('.viewer__content #read-only-editor')
 				.find('h1 [data-node-view-content]')
 				.should('have.text', 'V1')
 
-			cy.get('[data-files-versions-versions-list] li > a').eq(0).click()
+			cy.get('[data-files-versions-versions-list] li a').eq(0).click()
 			cy.getContent()
 				.find('h1 [data-node-view-content]')
 				.should('have.text', 'V3')
@@ -60,19 +60,19 @@ describe('Versions', () => {
 
 			cy.get('.app-sidebar-tabs__tab:contains("Versions")').click()
 
-			cy.get('[data-files-versions-versions-list] li > a').should('have.length', 3)
+			cy.get('[data-files-versions-versions-list] li a').should('have.length', 3)
 
-			cy.get('[data-files-versions-versions-list] li > a').eq(1).click()
+			cy.get('[data-files-versions-versions-list] li a').eq(1).click()
 			cy.get('.viewer__content #read-only-editor')
 				.find('h1 [data-node-view-content]')
 				.should('have.text', 'V2')
 
-			cy.get('[data-files-versions-versions-list] li > a').eq(2).click()
+			cy.get('[data-files-versions-versions-list] li a').eq(2).click()
 			cy.get('.viewer__content #read-only-editor')
 				.find('h1 [data-node-view-content]')
 				.should('have.text', 'V1')
 
-			cy.get('[data-files-versions-versions-list] li > a').eq(0).click()
+			cy.get('[data-files-versions-versions-list] li a').eq(0).click()
 			cy.getContent()
 				.find('h1 [data-node-view-content]')
 				.should('have.text', 'V3')
@@ -97,7 +97,7 @@ describe('Versions', () => {
 
 			cy.get('.app-sidebar-tabs__tab:contains("Versions")').click()
 
-			cy.get('[data-files-versions-versions-list] li > a').should('have.length', 3)
+			cy.get('[data-files-versions-versions-list] li a').should('have.length', 3)
 
 			cy.get('[data-files-versions-versions-list] li').eq(2)
 				.find('button.action-item__menutoggle').first().click({ force: true })

diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
@@ -22,6 +22,10 @@ before(() => {
 		  return false
 		}
 
+		if (err.message.includes('clearFocusTrap')) {
+			return false
+		}
+
 		return true
 	})
 })