Skip to content

Commit

Permalink
Merge pull request #6761 from nextcloud/backport/6760/stable30
Browse files Browse the repository at this point in the history
[stable30] fix(cy): avoid double upload to prevent lock error
  • Loading branch information
juliusknorr authored Dec 12, 2024
2 parents c671593 + 8d365d2 commit b126cd5
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions cypress/e2e/conflict.spec.js
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

0 comments on commit b126cd5

Please sign in to comment.