Skip to content

[main] fix(cy): avoid double upload to prevent lock error #6763

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 1 commit into from
Dec 10, 2024
Merged

[main] fix(cy): avoid double upload to prevent lock error #6763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix(cy): avoid double upload to prevent lock error 
`isolateTest` in `beforeEach` already uploads the file.

Uploading it again in the `no actual conflict - just reload` case

sometimes led to 423 - Locked responses.

Use `cy.createTestDir()` instead and upload only once.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud
max-nextcloud committed Dec 10, 2024
commit 79e6709fe14921ee3e68b8efb6ca59ed0714fc4c
13 changes: 8 additions & 5 deletions cypress/e2e/conflict.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,27 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import { initUserAndFiles, randUser } from '../utils/index.js'

const user = randUser()
import { randUser } from '../utils/index.js'

const variants = [
{ fixture: 'lines.txt', mime: 'text/plain' },
{ fixture: 'test.md', mime: 'text/markdown' },
]

variants.forEach(function({ fixture, mime }) {
const user = randUser()
const fileName = fixture
const prefix = mime.replaceAll('/', '-')
describe(`${mime} (${fileName})`, function() {
const getWrapper = () => cy.get('.text-editor__wrapper.has-conflicts')

before(() => {
initUserAndFiles(user)
cy.createUser(user)
})

beforeEach(function() {
cy.login(user)
cy.isolateTest({ sourceFile: fileName })
cy.createTestFolder()
})

it(prefix + ': no actual conflict - just reload', function() {
Expand Down Expand Up @@ -123,6 +122,10 @@ variants.forEach(function({ fixture, mime }) {
* @param {string} mime - mimetype
*/
function createConflict(fileName, mime) {
cy.testName().then(testName => {
cy.uploadFile(fileName, mime, `${testName}/${fileName}`)
})
cy.visitTestFolder()
cy.openFile(fileName)
cy.log('Inspect editor')
cy.getEditor().find('.ProseMirror').should('have.attr', 'contenteditable', 'true')
Expand Down
Loading