test(cypress): harden assertions

Signed-off-by: Ferdinand Thiessen <[email protected]>

Author: susnux

cypress/e2e/files/FilesUtils.ts

@@ -86,6 +86,7 @@ export function triggerActionForFile(filename: string, actionId: string) {
 		.as('actionButton')
 		.scrollIntoView()
 	cy.get('@actionButton')
+		.should('have.attr', 'aria-expanded', 'false')
 		.click({ force: true }) // force to avoid issues with overlaying file list header
 	getActionEntryForFile(filename, actionId)
 		.find('button')
@@ -287,7 +288,10 @@ export function navigateToFolder(dirPath: string) {
 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]').should('not.be.visible')
+	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(300)
 }
 
 /**

cypress/e2e/files_sharing/FilesSharingUtils.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { triggerActionForFile } from '../files/FilesUtils.ts'
+import { closeSidebar, triggerActionForFile } from '../files/FilesUtils.ts'
 
 export interface ShareSetting {
 	read: boolean
@@ -18,6 +18,7 @@ export interface ShareSetting {
 
 export function createShare(fileName: string, username: string, shareSettings: Partial<ShareSetting> = {}) {
 	openSharingPanel(fileName)
+	cy.intercept('POST', '**/ocs/v2.php/apps/files_sharing/api/v1/shares').as('createShare')
 
 	cy.get('#app-sidebar-vue').within(() => {
 		cy.intercept({ times: 1, method: 'GET', url: '**/apps/files_sharing/api/v1/sharees?*' }).as('userSearch')
@@ -30,6 +31,9 @@ export function createShare(fileName: string, username: string, shareSettings: P
 
 	// HACK: Save the share and then update it, as permissions changes are currently not saved for new share.
 	cy.get('[data-cy-files-sharing-share-editor-action="save"]').click({ scrollBehavior: 'nearest' })
+	cy.wait('@createShare')
+
+	closeSidebar()
 	updateShare(fileName, 0, shareSettings)
 }
 

cypress/e2e/files_sharing/limit_to_same_group.cy.ts

@@ -29,8 +29,8 @@ describe('Limit to sharing to people in the same group', () => {
 		cy.createRandomUser()
 			.then((user) => {
 				alice = user
-				cy.createRandomUser()
 			})
+		cy.createRandomUser()
 			.then((user) => {
 				bob = user
 
@@ -49,9 +49,12 @@ describe('Limit to sharing to people in the same group', () => {
 				cy.login(alice)
 				cy.visit('/apps/files')
 				createShare(randomFileName1, bob.userId)
+				cy.logout()
+
 				cy.login(bob)
 				cy.visit('/apps/files')
 				createShare(randomFileName2, alice.userId)
+				cy.logout()
 			})
 	})