ci: adjust cypress tests

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

Author: susnux

cypress/e2e/files/FilesUtils.ts

@@ -26,9 +26,8 @@ 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}`)
-			.should('exist')
-			.find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`))
+		.invoke('attr', 'aria-controls')
+		.then((menuId) => cy.get(`#${menuId} [data-cy-files-list-row-action="${CSS.escape(actionId)}"]`).should('exist'))
 }
 
 /**
@@ -39,9 +38,8 @@ export function getActionEntryForFileId(fileid: number, actionId: string) {
 export function getActionEntryForFile(file: string, actionId: string) {
 	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)}"]`))
+		.invoke('attr', 'aria-controls')
+		.then((menuId) => cy.get(`#${menuId} [data-cy-files-list-row-action="${CSS.escape(actionId)}"]`).should('exist'))
 }
 
 /**
@@ -73,9 +71,10 @@ export function triggerActionForFileId(fileid: number, actionId: string) {
 	getActionButtonForFileId(fileid)
 		.click({ force: true }) // force to avoid issues with overlaying file list header
 	getActionEntryForFileId(fileid, actionId)
-		.find('button')
-		.should('be.visible')
-		.click()
+		.then(($entry) => {
+			const menuItem = $entry.is('button') ? cy.wrap($entry) : cy.wrap($entry).findByRole('menuitem').last()
+			menuItem.should('be.visible').click()
+		})
 }
 
 /**
@@ -89,9 +88,10 @@ export function triggerActionForFile(filename: string, actionId: string) {
 	getActionButtonForFile(filename)
 		.click({ force: true }) // force to avoid issues with overlaying file list header
 	getActionEntryForFile(filename, actionId)
-		.find('button')
-		.should('be.visible')
-		.click()
+		.then(($entry) => {
+			const menuItem = $entry.is('button') ? cy.wrap($entry) : cy.wrap($entry).findByRole('menuitem').last()
+			menuItem.should('be.visible').click()
+		})
 }
 
 /**