Skip to content

feat: Save a checksum for documents and use it to detect conflicts #7677

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
blizzz merged 6 commits into from
Oct 6, 2025
Merged

feat: Save a checksum for documents and use it to detect conflicts #7677

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0200ce
feat: Save a checksum for documents and use it to detect conflicts
benjaminfrueh Sep 25, 2025
0cccac6
chore: Add SPDX information
benjaminfrueh Sep 25, 2025
9bc8a72
test: fix conflict spec to cover conflict and non-conflict uploads
benjaminfrueh Sep 28, 2025
297e69b
chore: apply prettier formatting
benjaminfrueh Sep 28, 2025
e5ec03f
test: fix scroll behaviour test and remove .only
benjaminfrueh Sep 28, 2025
c4d8dfd
test: update cypress test for conflicts
benjaminfrueh Sep 30, 2025
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
chore: apply prettier formatting 
Signed-off-by: Benjamin Frueh <[email protected]>
  • Loading branch information
@benjaminfrueh
benjaminfrueh committed Sep 28, 2025
commit 297e69bd518ded753f8fa702d01eb0ff8fd60711
27 changes: 15 additions & 12 deletions cypress/e2e/conflict.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,21 @@ variants.forEach(function ({ fixture, mime }) {
getWrapper().should('not.exist')
})

it.only(prefix + ': no conflict when uploading same file content', function () {
cy.testName().then((testName) => {
cy.uploadFile(fileName, mime, `${testName}/${fileName}`)
cy.visitTestFolder()
cy.openFile(fileName)
cy.uploadFile(fileName, mime, `${testName}/${fileName}`)

cy.get('.text-editor .document-status').should('not.exist')
getWrapper().should('not.exist')
cy.getContent().should('not.contain', 'edited')
})
})
it.only(
prefix + ': no conflict when uploading same file content',
function () {
cy.testName().then((testName) => {
cy.uploadFile(fileName, mime, `${testName}/${fileName}`)
cy.visitTestFolder()
cy.openFile(fileName)
cy.uploadFile(fileName, mime, `${testName}/${fileName}`)

cy.get('.text-editor .document-status').should('not.exist')
getWrapper().should('not.exist')
cy.getContent().should('not.contain', 'edited')
})
},
)
})
})

Expand Down
Loading