Skip to content

[stable29] Keep base version etag during reload #5987

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 7 commits into from
Jul 3, 2024
Merged

[stable29] Keep base version etag during reload #5987

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d3ad2d
fix(sessionApi): only mark api as closed on success
max-nextcloud Jun 24, 2024
a763c76
fix(reconnect): keep baseVersionEtag during reconnect
max-nextcloud Jun 24, 2024
e442874
refactor: hide connection in sync service
max-nextcloud Jun 27, 2024
c2591b3
test(cy): wait longer for initial sync to avoid timeouts
max-nextcloud Jul 1, 2024
82dc59c
test(cy): also test failed reconnect attempt
max-nextcloud Jul 1, 2024
08248f8
fix(Editor): separate close and disconnect functions
max-nextcloud Jul 1, 2024
2200c96
refactor(yjs): move queue handling into helper
max-nextcloud Jul 2, 2024
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): also test failed reconnect attempt 
Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @backportbot
max-nextcloud authored and backportbot[bot] committed Jul 3, 2024
commit 82dc59c79da7ab376a3a11bcd07f02a361d48af5
15 changes: 9 additions & 6 deletions cypress/e2e/sync.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,15 @@ describe('Sync', () => {
.should('contain', 'Document could not be loaded.')
cy.get('#editor-container .document-status')
.find('.button.primary').click()
cy.intercept('**/apps/text/session/*/*', req => {
if (req.url.endsWith('create')) {
req.alias = 'create'
}
req.continue()
}).as('alive')
cy.get('.toastify').should('contain', 'Connection failed.')
cy.get('.toastify', { timeout: 30000 }).should('not.exist')
cy.get('#editor-container .document-status', { timeout: 30000 })
.should('contain', 'Document could not be loaded.')
// bring back the network connection
cy.intercept('**/apps/text/session/*/*', req => { req.continue() }).as('alive')
cy.intercept('**/apps/text/session/*/create').as('create')
cy.get('#editor-container .document-status')
.find('.button.primary').click()
cy.wait('@alive', { timeout: 30000 })
cy.wait('@create', { timeout: 10000 })
.its('request.body')
Expand Down