Merge pull request #2584 from nextcloud/test/retry-failed-cypress-tests

test: retry failed cypress tests twice

Author: Vinicius Reis

cypress.config.js

@@ -20,4 +20,5 @@ module.exports = defineConfig({
 		experimentalSessionAndOrigin: true,
 		specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
 	},
+	retries: 2,
 })

cypress/e2e/images.spec.js

@@ -135,6 +135,7 @@ const waitForRequestAndCheckImage = (requestAlias, index) => {
 describe('Test all image insertion methods', () => {
 	before(() => {
 		initUserAndFiles(randUser, 'test.md', 'empty.md')
+
 		cy.uploadFile('github.png', 'image/png')
 
 		cy.nextcloudCreateUser(randUser2, 'password')
@@ -161,6 +162,7 @@ describe('Test all image insertion methods', () => {
 
 	it('Insert an image from files', () => {
 		cy.openFile('test.md')
+
 		clickOnImageAction(ACTION_INSERT_FROM_FILES)
 			.then(() => {
 				const requestAlias = 'insertPathRequest'
@@ -171,7 +173,7 @@ describe('Test all image insertion methods', () => {
 				cy.log('Click OK in the filepicker')
 				cy.get('.oc-dialog > .oc-dialog-buttonrow button').click()
 
-				waitForRequestAndCheckImage(requestAlias)
+				return waitForRequestAndCheckImage(requestAlias)
 			})
 	})
 
@@ -192,8 +194,12 @@ describe('Test all image insertion methods', () => {
 	})
 
 	it('Upload images with the same name', () => {
-		cy.uploadFile('empty.md', 'text/markdown')
-		cy.openFile('empty.md')
+		// make sure we start from an emtpy file even on retries
+		const filename = randHash() + '.md'
+
+		cy.uploadFile('empty.md', 'text/markdown', filename)
+		cy.reloadFileList()
+		cy.openFile(filename)
 
 		const assertImage = index => {
 			return clickOnImageAction(ACTION_UPLOAD_LOCAL_FILE)

cypress/support/commands.js

@@ -163,26 +163,26 @@ Cypress.Commands.add('shareFileToUser', (userId, password, path, targetUserId) =
 })
 
 Cypress.Commands.add('createFolder', dirName => {
-	cy.window().then(win => {
+	return cy.window().then(win => {
 		return win.OC.Files.getClient().createDirectory(dirName)
 	})
 })
 
 Cypress.Commands.add('moveFile', (path, destinationPath) => {
-	cy.window().then(win => {
-		win.OC.Files.getClient().move(path, destinationPath)
+	return cy.window().then(win => {
+		return win.OC.Files.getClient().move(path, destinationPath)
 	})
 })
 
 Cypress.Commands.add('copyFile', (path, destinationPath) => {
-	cy.window().then(win => {
-		win.OC.Files.getClient().copy(path, destinationPath)
+	return cy.window().then(win => {
+		return win.OC.Files.getClient().copy(path, destinationPath)
 	})
 })
 
 Cypress.Commands.add('reloadFileList', () => {
-	cy.window().then(win => {
-		win.OCA?.Files?.App?.fileList?.reload()
+	return cy.window().then(win => {
+		return win.OCA?.Files?.App?.fileList?.reload()
 	})
 })
 

cypress/utils/index.js

@@ -35,17 +35,15 @@ export const getSearchParams = url => {
  * Can be used e.g. for a `before()`
  *
  * @param {string} userName Username of the user to create
- * @param {...string} file one ore more markdown file names to create
+ * @param {...string} files one ore more markdown file names to create
  */
-export function initUserAndFiles(userName, file) {
-	const files = [...arguments].slice(1)
-
+export function initUserAndFiles(userName, ...files) {
 	// Init user
 	cy.nextcloudCreateUser(userName, 'password')
 	cy.login(userName, 'password')
 
 	// Upload test files
-	files.forEach(file => {
+	;(files || []).forEach(file => {
 		cy.uploadFile(file, 'text/markdown')
 	})
 }