Skip to content

Commit 622e061

Browse files
come-ncpringelmann
authored andcommitted
chore(ci): Use the proper helper function to trigger action on selected rows
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 3771f4f commit 622e061

2 files changed

Lines changed: 7 additions & 29 deletions

File tree

cypress/e2e/files/files-delete.cy.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile } from './FilesUtils.ts'
8+
import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile, triggerSelectionAction } from './FilesUtils.ts'
99

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

5151
// select all
5252
selectAllFiles()
53-
cy.get('[data-cy-files-list-selection-actions]')
54-
.findByRole('button', { name: 'Actions' })
55-
.click()
56-
cy.get('[data-cy-files-list-selection-action="delete"]')
57-
.findByRole('menuitem', { name: /^Delete files/ })
58-
.click()
53+
triggerSelectionAction('delete')
5954

6055
// see dialog for confirmation
6156
cy.findByRole('dialog', { name: 'Confirm deletion' })

cypress/e2e/files/files-download.cy.ts

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { User } from '@nextcloud/e2e-test-server/cypress'
88
import { zipFileContains } from '../../support/utils/assertions.ts'
99
import { deleteDownloadsFolderBeforeEach } from '../../support/utils/deleteDownloadsFolder.ts'
1010
import { randomString } from '../../support/utils/randomString.ts'
11-
import { getRowForFile, navigateToFolder, triggerActionForFile } from './FilesUtils.ts'
11+
import { getRowForFile, navigateToFolder, triggerActionForFile, triggerSelectionAction } from './FilesUtils.ts'
1212

1313
describe('files: Download files using file actions', { testIsolation: true }, () => {
1414
let user: User
@@ -194,12 +194,7 @@ describe('files: Download files using selection', () => {
194194
})
195195

196196
// click download
197-
cy.get('[data-cy-files-list-selection-actions]')
198-
.findByRole('button', { name: 'Actions' })
199-
.click()
200-
cy.findByRole('menuitem', { name: 'Download (selected)' })
201-
.should('be.visible')
202-
.click()
197+
triggerSelectionAction('download')
203198

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

239234
// click download
240-
cy.get('[data-cy-files-list-selection-actions]')
241-
.findByRole('button', { name: 'Actions' })
242-
.click()
243-
cy.findByRole('menuitem', { name: 'Download (selected)' })
244-
.click()
235+
triggerSelectionAction('download')
245236

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

284275
// click download
285-
cy.get('[data-cy-files-list-selection-actions]')
286-
.findByRole('button', { name: 'Actions' })
287-
.click()
288-
cy.findByRole('menuitem', { name: 'Download (selected)' })
289-
.click()
276+
triggerSelectionAction('download')
290277

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

332319
// click download
333-
cy.get('[data-cy-files-list-selection-actions]')
334-
.findByRole('button', { name: 'Actions' })
335-
.click()
336-
cy.findByRole('menuitem', { name: 'Download (selected)' })
337-
.click()
320+
triggerSelectionAction('download')
338321

339322
// check a file is downloaded
340323
const downloadsFolder = Cypress.config('downloadsFolder')

0 commit comments

Comments
 (0)