Skip to content

[stable27] Flaky CI fixes #4391

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
mejo- merged 7 commits into from
Jun 27, 2023
Merged

[stable27] Flaky CI fixes #4391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
737f934
use proper database for cypress
juliusknorr Jun 23, 2023
a63de8b
ci(phpunit): Work around flaky self hosted runners
juliusknorr Jun 23, 2023
1a16bbe
ci(cypress): Use cy.request instead of axios
juliusknorr Jun 23, 2023
f3722bf
ci(cypress): Use cypress select file
juliusknorr Jun 23, 2023
36375f7
ci(cypress): Attempt to fix flaky recovery test
juliusknorr Jun 25, 2023
8942def
ci(cypress): Avoid unneeded user removal
juliusknorr Jun 25, 2023
11b3428
ci(cypress): Clear page to avoid issues when switching sessions while…
juliusknorr Jun 25, 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
ci(cypress): Use cypress select file 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @mejo-
juliusknorr authored and mejo- committed Jun 27, 2023
commit f3722bfc57d3927d3611678953eb63d9030ef910
8 changes: 6 additions & 2 deletions cypress/e2e/attachments.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/

import { initUserAndFiles, randHash, randUser } from '../utils/index.js'
import 'cypress-file-upload'

const user = randUser()
const recipient = randUser()
Expand All @@ -41,7 +40,12 @@ function attachFile(name, requestAlias = null) {
}
return cy.getEditor()
.find('input[type="file"][data-text-el="attachment-file-input"]')
.attachFile(name)
.selectFile([
{
contents: 'cypress/fixtures/' + name,
fileName: name,
},
], { force: true })
}

/**
Expand Down
1 change: 0 additions & 1 deletion cypress/e2e/nodes/Mentions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { initUserAndFiles, randUser } from '../../utils/index.js'
import 'cypress-file-upload'

const user = randUser()
const mentionMe = randUser()
Expand Down
20 changes: 0 additions & 20 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 @@ -124,7 +124,6 @@
"@vue/test-utils": "^1.3.0 <2",
"@vue/vue2-jest": "^29.2.4",
"cypress": "^12.16.0",
"cypress-file-upload": "^5.0.8",
"eslint-plugin-cypress": "^2.13.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.5.0",
Expand Down