diff --git a/cypress/e2e/files/filesUtils.ts b/cypress/e2e/files/filesUtils.ts index d786d1f42..c8fe5e039 100644 --- a/cypress/e2e/files/filesUtils.ts +++ b/cypress/e2e/files/filesUtils.ts @@ -198,9 +198,19 @@ export const navigateToFolder = (dirPath: string) => { } -export const closeSidebar = () => { +/** + * Close the sidebar + */ +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(500) + cy.url() + .should('not.contain', 'opendetails') } export const clickOnBreadcrumbs = (label: string) => { diff --git a/cypress/e2e/files_versions/filesVersionsUtils.ts b/cypress/e2e/files_versions/filesVersionsUtils.ts index 5f2f2532d..9793500bb 100644 --- a/cypress/e2e/files_versions/filesVersionsUtils.ts +++ b/cypress/e2e/files_versions/filesVersionsUtils.ts @@ -2,10 +2,11 @@ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ -/* eslint-disable jsdoc/require-jsdoc */ import type { User } from '@nextcloud/cypress' + +import { basename } from '@nextcloud/paths' import { addUserToGroup, createGroup, createGroupFolder, PERMISSION_DELETE, PERMISSION_READ, PERMISSION_WRITE } from '../groupfoldersUtils' -import { navigateToFolder } from '../files/filesUtils' +import { navigateToFolder, triggerActionForFile } from '../files/filesUtils' type SetupInfo = { dataSnapshot: string @@ -69,13 +70,15 @@ export const uploadThreeVersions = (user: User, fileName: string) => { export function openVersionsPanel(fileName: string) { // Detect the versions list fetch - cy.intercept({ method: 'PROPFIND', times: 1, url: '**/dav/versions/*/versions/**' }).as('getVersions') - - // Open the versions tab - cy.window().then(win => { - win.OCA.Files.Sidebar.setActiveTab('files_versions') - win.OCA.Files.Sidebar.open(`/${fileName}`) - }) + cy.intercept('PROPFIND', '**/dav/versions/*/versions/**').as('getVersions') + + triggerActionForFile(basename(fileName), 'details') + cy.get('[data-cy-sidebar]') + .as('sidebar') + .should('be.visible') + cy.get('@sidebar') + .find('[aria-controls="tab-files_versions"]') + .click() // Wait for the versions list to be fetched cy.wait('@getVersions')