Merge pull request #1325 from nextcloud/artonge/bump/cypress/13

Bump cypress to v13
nextcloud · Sep 21, 2023 · e0e2532 · e0e2532
2 parents 67e556d + 7e386d5
commit e0e2532
Show file tree

Hide file tree

Showing 4 changed files with 355 additions and 145 deletions.
diff --git a/cypress/e2e/filesUtils.ts b/cypress/e2e/filesUtils.ts
@@ -21,7 +21,7 @@
  */
 
 export function renameFile(fileName: string, newName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions]`).click()
+	toggleMenuAction(fileName)
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="rename"]`).click()
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] .files-list__row-rename input`).clear()
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] .files-list__row-rename input`).type(`${newName}.txt`)
@@ -45,9 +45,13 @@ export function createFolder (dirName: string) {
 }
 
 export function moveFile (fileName: string, dirName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions]`).click()
+	toggleMenuAction(fileName)
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="movecopy]"`).click()
 	cy.get(`.oc-dialog tr[data-entryname="${dirName}"]`).click()
 	cy.contains(`Move to ${dirName}`).click()
 	cy.wait(500)
-}
+}
+
+export function toggleMenuAction(fileName: string) {
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions] .action-item__menutoggle`).click()
+}
diff --git a/cypress/e2e/sidebarUtils.ts b/cypress/e2e/sidebarUtils.ts
@@ -20,9 +20,11 @@
  *
  */
 
+import { toggleMenuAction } from "./filesUtils"
+
 function showSidebarForFile(fileName: string) {
 	closeSidebar()
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions]`).click()
+	toggleMenuAction(fileName)
 	cy.contains('Open details').click()
 	cy.get('#app-sidebar-vue').contains('Activity').click()
 }
@@ -42,19 +44,19 @@ export function showActivityTab(fileName: string) {
 }
 
 export function addToFavorites(fileName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions]`).click()
+	toggleMenuAction(fileName)
 	cy.contains('Add to favorites').click()
 	cy.get('.toast-close').click()
 }
 
 export function removeFromFavorites(fileName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions]`).click()
+	toggleMenuAction(fileName)
 	cy.contains('Remove from favorites').click()
 	cy.get('.toast-close').click()
 }
 
 export function createPublicShare(fileName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions]`).click()
+	toggleMenuAction(fileName)
 	cy.contains('Open details').click()
 	cy.get('#app-sidebar-vue').contains('Sharing').click()