aboutsummaryrefslogtreecommitdiffstats
path: root/cypress
diff options
context:
space:
mode:
authorLouis Chemineau <louis@chmn.me>2023-03-22 13:54:29 +0100
committerLouis Chemineau <louis@chmn.me>2023-03-30 10:09:13 +0200
commit49134c65954e7d2e6aa22960a16bd71f5d79403f (patch)
tree5be4e834c8b0ab4cb591f94c4c692423cba71a9f /cypress
parent2eda49e28d4ae80079a25ceb8566b9b6df9daeba (diff)
downloadnextcloud-server-49134c65954e7d2e6aa22960a16bd71f5d79403f.tar.gz
nextcloud-server-49134c65954e7d2e6aa22960a16bd71f5d79403f.zip
Increase wait to ensure versions are created
In files_versions cypress tests, we wait for 1000ms between each versions uploads to make sure that the server properly create a version. Under 1s the serve does not create a version. This commit increases the wait time as it might help to ensure that the time span is enough between two uploads. Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'cypress')
-rw-r--r--cypress/e2e/files_versions/filesVersionsUtils.ts4
-rw-r--r--cypress/support/commands.ts51
2 files changed, 27 insertions, 28 deletions
diff --git a/cypress/e2e/files_versions/filesVersionsUtils.ts b/cypress/e2e/files_versions/filesVersionsUtils.ts
index 1aa7ebde316..e2267538471 100644
--- a/cypress/e2e/files_versions/filesVersionsUtils.ts
+++ b/cypress/e2e/files_versions/filesVersionsUtils.ts
@@ -24,9 +24,9 @@ import path from "path"
export function uploadThreeVersions(user) {
cy.uploadContent(user, new Blob(['v1'], { type: 'text/plain' }), 'text/plain', '/test.txt')
- cy.wait(1000)
+ cy.wait(1500)
cy.uploadContent(user, new Blob(['v2'], { type: 'text/plain' }), 'text/plain', '/test.txt')
- cy.wait(1000)
+ cy.wait(1500)
cy.uploadContent(user, new Blob(['v3'], { type: 'text/plain' }), 'text/plain', '/test.txt')
cy.login(user)
}
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index d214bb2b45e..1a9999343d5 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -99,33 +99,32 @@ Cypress.Commands.add('uploadFile', (user, fixture = 'image.jpg', mimeType = 'ima
*/
Cypress.Commands.add('uploadContent', (user, blob, mimeType, target) => {
cy.clearCookies()
- .then(async () => {
- const fileName = basename(target)
-
- // Process paths
- const rootPath = `${Cypress.env('baseUrl')}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
- const filePath = target.split('/').map(encodeURIComponent).join('/')
- try {
- const file = new File([blob], fileName, { type: mimeType })
- await axios({
- url: `${rootPath}${filePath}`,
- method: 'PUT',
- data: file,
- headers: {
- 'Content-Type': mimeType,
- },
- auth: {
- username: user.userId,
- password: user.password,
- },
- }).then(response => {
+ .then(async () => {
+ const fileName = basename(target)
+
+ // Process paths
+ const rootPath = `${Cypress.env('baseUrl')}/remote.php/dav/files/${encodeURIComponent(user.userId)}`
+ const filePath = target.split('/').map(encodeURIComponent).join('/')
+ try {
+ const file = new File([blob], fileName, { type: mimeType })
+ const response = await axios({
+ url: `${rootPath}${filePath}`,
+ method: 'PUT',
+ data: file,
+ headers: {
+ 'Content-Type': mimeType,
+ },
+ auth: {
+ username: user.userId,
+ password: user.password,
+ },
+ })
cy.log(`Uploaded content as ${fileName}`, response)
- })
- } catch (error) {
- cy.log('error', error)
- throw new Error(`Unable to process fixture`)
- }
- })
+ } catch (error) {
+ cy.log('error', error)
+ throw new Error('Unable to process fixture')
+ }
+ })
})
/**