test: adjust cypress tests

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

cypress.config.ts

@@ -25,9 +25,9 @@ export default defineConfig({
 	viewportWidth: 1280,
 	viewportHeight: 720,
 
-	// Tries again 2 more times on failure
+	// Tries again when in run mode (cypress run) e.g. on CI
 	retries: {
-		runMode: 2,
+		runMode: 3,
 		// do not retry in `cypress open`
 		openMode: 0,
 	},

cypress/e2e/files/FilesUtils.ts

@@ -24,7 +24,9 @@ export const getActionButtonForFile = (filename: string) => getActionsForFile(fi
 export function getActionEntryForFileId(fileid: number, actionId: string) {
 	return getActionButtonForFileId(fileid)
 		.should('have.attr', 'aria-controls')
-		.then((menuId) => cy.get(`#${menuId}`).find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`))
+		.then((menuId) => cy.get(`#${menuId}`)
+			.should('exist')
+			.find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`))
 }
 
 /**
@@ -33,12 +35,11 @@ export function getActionEntryForFileId(fileid: number, actionId: string) {
  * @param actionId
  */
 export function getActionEntryForFile(file: string, actionId: string) {
-	getActionButtonForFile(file)
-		.if('not.have.attr', 'aria-expanded', 'true')
-		.click({ force: true })
-
-	return cy.findByRole('menu')
-		.find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`)
+	return getActionButtonForFile(file)
+		.should('have.attr', 'aria-controls')
+		.then((menuId) => cy.get(`#${menuId}`)
+			.should('exist')
+			.find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`))
 }
 
 /**
@@ -68,9 +69,8 @@ export function getInlineActionEntryForFile(file: string, actionId: string) {
  */
 export function triggerActionForFileId(fileid: number, actionId: string) {
 	getActionButtonForFileId(fileid)
-		.as('actionButton')
 		.scrollIntoView()
-	cy.get('@actionButton')
+	getActionButtonForFileId(fileid)
 		.click({ force: true }) // force to avoid issues with overlaying file list header
 	getActionEntryForFileId(fileid, actionId)
 		.find('button')
@@ -85,8 +85,9 @@ export function triggerActionForFileId(fileid: number, actionId: string) {
  */
 export function triggerActionForFile(filename: string, actionId: string) {
 	getActionButtonForFile(filename)
-		.should('have.attr', 'aria-expanded', 'false')
-		.click({ force: true, scrollBehavior: 'nearest' }) // force to avoid issues with overlaying file list header
+		.scrollIntoView()
+	getActionButtonForFile(filename)
+		.click({ force: true }) // force to avoid issues with overlaying file list header
 	getActionEntryForFile(filename, actionId)
 		.find('button')
 		.should('be.visible')
@@ -286,11 +287,17 @@ export function navigateToFolder(dirPath: string) {
  */
 export function closeSidebar() {
 	// {force: true} as it might be hidden behind toasts
-	cy.get('[data-cy-sidebar] .app-sidebar__close').click({ force: true })
+	cy.get('[data-cy-sidebar] .app-sidebar__close')
+		.click({ force: true })
 	cy.get('[data-cy-sidebar]')
 		.should('not.be.visible')
 	// eslint-disable-next-line cypress/no-unnecessary-waiting -- wait for the animation to finish
-	cy.wait(300)
+	cy.wait(500)
+	// close all toasts
+	cy.get('.toast-success')
+		.if()
+		.findAllByRole('button')
+		.click({ force: true, multiple: true })
 }
 
 /**

cypress/e2e/files_sharing/FilesSharingUtils.ts

@@ -32,11 +32,8 @@ export function createShare(fileName: string, username: string, shareSettings: P
 	// HACK: Save the share and then update it, as permissions changes are currently not saved for new share.
 	cy.get('[data-cy-files-sharing-share-editor-action="save"]').click({ scrollBehavior: 'nearest' })
 	cy.wait('@createShare')
-	cy.get('.toast-success')
-		.findAllByRole('button')
-		.click({ force: true, multiple: true })
-
 	closeSidebar()
+
 	updateShare(fileName, 0, shareSettings)
 }
 
@@ -135,16 +132,16 @@ export function updateShare(fileName: string, index: number, shareSettings: Part
 
 		cy.wait('@updateShare')
 	})
-	// close all toasts
-	cy.get('.toast-success')
-		.findAllByRole('button')
-		.click({ force: true, multiple: true })
+	closeSidebar()
 }
 
 export function openSharingPanel(fileName: string) {
 	triggerActionForFile(fileName, 'details')
 
 	cy.get('[data-cy-sidebar]')
+		.as('sidebar')
+		.should('be.visible')
+	cy.get('@sidebar')
 		.find('[aria-controls="tab-sharing"]')
 		.click()
 }

cypress/e2e/files_versions/filesVersionsUtils.ts

@@ -28,6 +28,9 @@ export function openVersionsPanel(fileName: string) {
 
 	triggerActionForFile(basename(fileName), 'details')
 	cy.get('[data-cy-sidebar]')
+		.as('sidebar')
+		.should('be.visible')
+	cy.get('@sidebar')
 		.find('[aria-controls="tab-files_versions"]')
 		.click()
 

cypress/e2e/files_versions/version_naming.cy.ts

@@ -68,8 +68,14 @@ describe('Versions naming', () => {
 		setupTestSharedFileFromUser(user, randomFileName, { update: false })
 		openVersionsPanel(randomFileName)
 
-		cy.get('[data-files-versions-version]').eq(0).find('.action-item__menutoggle').should('not.exist')
-		cy.get('[data-files-versions-version]').eq(0).get('[data-cy-version-action="label"]').should('not.exist')
+		cy.get('[data-files-versions-version]')
+			.eq(0)
+			.as('firstVersion')
+			.find('.action-item__menutoggle')
+			.should('not.exist')
+		cy.get('@firstVersion')
+			.find('[data-cy-version-action="label"]')
+			.should('not.exist')
 
 		doesNotHaveAction(1, 'label')
 		doesNotHaveAction(2, 'label')