Skip to content

[stable33] test(cypress): Reduce flakiness #60302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 4 commits into from
May 12, 2026
Merged

[stable33] test(cypress): Reduce flakiness #60302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9655a5
chore(ci): Increase again timeout for Oracle setup
come-nc May 11, 2026
bcbb294
chore(ci): Invert line checking order in version_restoration
come-nc May 11, 2026
c298ce0
chore(ci): Use the proper helper function to trigger action on select…
come-nc May 11, 2026
e21f4a6
chore(ci): Make row action helpers atomic to avoid mid-render detachment
pringelmann May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cypress/e2e/files/FilesUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ const ACTION_COPY_MOVE = 'move-copy'
export const getRowForFileId = (fileid: string | number) => cy.get(`[data-cy-files-list-row-fileid="${fileid}"]`)
export const getRowForFile = (filename: string) => cy.get(`[data-cy-files-list-row-name="${CSS.escape(filename)}"]`)

export const getActionsForFileId = (fileid: number) => getRowForFileId(fileid).find('[data-cy-files-list-row-actions]')
export const getActionsForFile = (filename: string) => getRowForFile(filename).find('[data-cy-files-list-row-actions]')
// Atomic query so the lookup is retried as a whole when rows re-render
// (chained .find() can fail with "subject no longer attached" mid-render).
export const getActionsForFileId = (fileid: number) => cy.get(`[data-cy-files-list-row-fileid="${fileid}"] [data-cy-files-list-row-actions]`)
export const getActionsForFile = (filename: string) => cy.get(`[data-cy-files-list-row-name="${CSS.escape(filename)}"] [data-cy-files-list-row-actions]`)

export const getActionButtonForFileId = (fileid: number) => getActionsForFileId(fileid).findByRole('button', { name: 'Actions' })
export const getActionButtonForFile = (filename: string) => getActionsForFile(filename).findByRole('button', { name: 'Actions' })
Expand Down Expand Up @@ -48,8 +50,7 @@ export function getActionEntryForFile(file: string, actionId: string) {
* @param actionId
*/
export function getInlineActionEntryForFileId(fileid: number, actionId: string) {
return getActionsForFileId(fileid)
.find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`)
return cy.get(`[data-cy-files-list-row-fileid="${fileid}"] [data-cy-files-list-row-action="${CSS.escape(actionId)}"]`)
}

/**
Expand All @@ -58,8 +59,7 @@ export function getInlineActionEntryForFileId(fileid: number, actionId: string)
* @param actionId
*/
export function getInlineActionEntryForFile(file: string, actionId: string) {
return getActionsForFile(file)
.find(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"]`)
return cy.get(`[data-cy-files-list-row-name="${CSS.escape(file)}"] [data-cy-files-list-row-action="${CSS.escape(actionId)}"]`)
}

/**
Expand Down
9 changes: 2 additions & 7 deletions cypress/e2e/files/files-delete.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import type { User } from '@nextcloud/e2e-test-server/cypress'

import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile } from './FilesUtils.ts'
import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile, triggerSelectionAction } from './FilesUtils.ts'

describe('files: Delete files using file actions', { testIsolation: true }, () => {
let user: User
Expand Down Expand Up @@ -50,12 +50,7 @@ describe('files: Delete files using file actions', { testIsolation: true }, () =

// select all
selectAllFiles()
cy.get('[data-cy-files-list-selection-actions]')
.findByRole('button', { name: 'Actions' })
.click()
cy.get('[data-cy-files-list-selection-action="delete"]')
.findByRole('menuitem', { name: /^Delete files/ })
.click()
triggerSelectionAction('delete')

// see dialog for confirmation
cy.findByRole('dialog', { name: 'Confirm deletion' })
Expand Down
27 changes: 5 additions & 22 deletions cypress/e2e/files/files-download.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { User } from '@nextcloud/e2e-test-server/cypress'
import { zipFileContains } from '../../support/utils/assertions.ts'
import { deleteDownloadsFolderBeforeEach } from '../../support/utils/deleteDownloadsFolder.ts'
import { randomString } from '../../support/utils/randomString.ts'
import { getRowForFile, navigateToFolder, triggerActionForFile } from './FilesUtils.ts'
import { getRowForFile, navigateToFolder, triggerActionForFile, triggerSelectionAction } from './FilesUtils.ts'

describe('files: Download files using file actions', { testIsolation: true }, () => {
let user: User
Expand Down Expand Up @@ -194,12 +194,7 @@ describe('files: Download files using selection', () => {
})

// click download
cy.get('[data-cy-files-list-selection-actions]')
.findByRole('button', { name: 'Actions' })
.click()
cy.findByRole('menuitem', { name: 'Download (selected)' })
.should('be.visible')
.click()
triggerSelectionAction('download')

// check a file is downloaded
const downloadsFolder = Cypress.config('downloadsFolder')
Expand Down Expand Up @@ -237,11 +232,7 @@ describe('files: Download files using selection', () => {
})

// click download
cy.get('[data-cy-files-list-selection-actions]')
.findByRole('button', { name: 'Actions' })
.click()
cy.findByRole('menuitem', { name: 'Download (selected)' })
.click()
triggerSelectionAction('download')

// check a file is downloaded
const downloadsFolder = Cypress.config('downloadsFolder')
Expand Down Expand Up @@ -282,11 +273,7 @@ describe('files: Download files using selection', () => {
})

// click download
cy.get('[data-cy-files-list-selection-actions]')
.findByRole('button', { name: 'Actions' })
.click()
cy.findByRole('menuitem', { name: 'Download (selected)' })
.click()
triggerSelectionAction('download')

// check a file is downloaded
const downloadsFolder = Cypress.config('downloadsFolder')
Expand Down Expand Up @@ -330,11 +317,7 @@ describe('files: Download files using selection', () => {
})

// click download
cy.get('[data-cy-files-list-selection-actions]')
.findByRole('button', { name: 'Actions' })
.click()
cy.findByRole('menuitem', { name: 'Download (selected)' })
.click()
triggerSelectionAction('download')

// check a file is downloaded
const downloadsFolder = Cypress.config('downloadsFolder')
Expand Down
14 changes: 6 additions & 8 deletions cypress/e2e/files_sharing/share-status-action.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import type { User } from '@nextcloud/e2e-test-server/cypress'

import { closeSidebar, enableGridMode, getActionButtonForFile, getInlineActionEntryForFile, getRowForFile } from '../files/FilesUtils.ts'
import { closeSidebar, enableGridMode, getActionButtonForFile, getActionsForFile, getInlineActionEntryForFile, getRowForFile } from '../files/FilesUtils.ts'
import { createShare } from './FilesSharingUtils.ts'

describe('files_sharing: Sharing status action', { testIsolation: true }, () => {
Expand All @@ -23,9 +23,8 @@ describe('files_sharing: Sharing status action', { testIsolation: true }, () =>

cy.visit('/apps/files')

getRowForFile('folder')
.should('be.visible')
.find('[data-cy-files-list-row-actions]')
getRowForFile('folder').should('be.visible')
getActionsForFile('folder')
.findByRole('button', { name: 'Shared' })
.should('not.exist')
})
Expand All @@ -38,12 +37,11 @@ describe('files_sharing: Sharing status action', { testIsolation: true }, () =>
cy.visit('/apps/files')
})

getRowForFile('folder')
.should('be.visible')
.find('[data-cy-files-list-row-actions]')
getRowForFile('folder').should('be.visible')
getActionsForFile('folder')
.findByRole('button', { name: /Sharing options/ })
.should('be.visible')
.click()
.click({ force: true })

// check the click opened the sidebar
cy.get('[data-cy-sidebar]')
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/files_versions/version_restoration.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('Versions restoration', () => {
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="restore"]').should('not.exist')

doesNotHaveAction(1, 'restore')
doesNotHaveAction(2, 'restore')
doesNotHaveAction(1, 'restore')
})
})
Loading