Skip to content

[stable28] test(cy): skip test failing due to server issue #5145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-nextcloud merged 6 commits into from
Dec 21, 2023
Merged

[stable28] test(cy): skip test failing due to server issue #5145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cc4ef3
test(cy): skip test failing due to server issue
max-nextcloud Dec 15, 2023
2c8e226
test(cy): simplify requesttoken handling
max-nextcloud Dec 13, 2023
8268961
fix(cy): attachment spec share test
max-nextcloud Dec 13, 2023
e9f2957
test(cy): silence `cy.window`
max-nextcloud Dec 13, 2023
c83beee
chore(ci): use current upload-artifact action
max-nextcloud Dec 13, 2023
ee99bc1
test(ci): upload nextcloud.log to different files
max-nextcloud Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test(cy): simplify requesttoken handling 
* Use `this.requesttoken` rather than `cy.get(@requesttoken)`
  to use the same value rather than re-evaluating the query.
* After visit `this.requesttoken` will be set.
  No need to attempt to load the token from the window
  if it is not.
* Use a simple `if` statement instead of `cypress-if`.
* This also cleans up the cypress logs significantly.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @juliusknorr
max-nextcloud authored and juliusknorr committed Dec 21, 2023
commit 2c8e2268dedc7ea1d28ea9c61bcd16b1028ab86e
30 changes: 9 additions & 21 deletions cypress/support/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import axios from '@nextcloud/axios'
import { addCommands } from '@nextcloud/cypress'
import 'cypress-if'
import compareSnapshotCommand from 'cypress-visual-regression/dist/command.js'

// eslint-disable-next-line no-unused-vars,n/no-extraneous-import
Expand Down Expand Up @@ -57,27 +56,16 @@ Cypress.Commands.overwrite('visit', (originalFn, url, options) => {
})

Cypress.Commands.add('getRequestToken', () => {
cy.get('@requesttoken')
.if((token) => !token)
.then(() => {
cy.window()
.then((win) => cy.wrap(win?.OC?.requestToken))
.if((token) => !!token)
.then((token) => {
cy.log('Request token from window', token)
})
cy.then(function() {
if (this.requesttoken) {
return this.requesttoken
} else {
cy.log('Fetching request token')
return cy.request('/csrftoken')
.its('body.token')
.as('requesttoken')
.else()
.then((token) => {
cy.log('Request token fetching', token)
return cy.request('/csrftoken')
.then(({ body }) => {
return body.token
})
}).as('requesttoken')
})

return cy.get('@requesttoken')
}
})
})

Cypress.Commands.add('ocsRequest', (options) => {
Expand Down
19 changes: 0 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
"@vue/vue2-jest": "^29.2.6",
"@vueuse/core": "^10.7.0",
"cypress": "^13.6.1",
"cypress-if": "^1.10.5",
"cypress-split": "^1.17.1",
"cypress-visual-regression": "^3.0.0",
"eslint-plugin-cypress": "^2.15.1",
Expand Down