ci: Make cypress test more stable by closing connections

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Apr 2, 2024 · ddabaf0 · ddabaf0
1 parent d464338
commit ddabaf0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/cypress/e2e/initial.spec.js b/cypress/e2e/initial.spec.js
@@ -35,9 +35,6 @@ describe('Test state loading of documents', function() {
 	})
 	beforeEach(function() {
 		cy.login(user)
-		cy.intercept({ method: 'POST', url: '**/session/*/push' }).as('push')
-		cy.intercept({ method: 'POST', url: '**/session/*/sync' }).as('sync')
-		cy.intercept({ method: 'POST', url: '**/session/*/save' }).as('save')
 	})
 
 	it('Initial content can not be undone', function() {
@@ -62,25 +59,29 @@ describe('Test state loading of documents', function() {
 	it('Consecutive sessions work properly', function() {
 		let readToken = null
 		let writeToken = null
+		cy.interceptCreate()
 		cy.shareFile('/test2.md')
 			.then((token) => {
 				readToken = token
 				cy.logout()
 				cy.visit(`/s/${readToken}`)
+				cy.wait('@create')
 			})
 			.then(() => {
 				// Open read only for the first time
 				cy.getEditor().should('be.visible')
 				cy.getContent()
 					.should('contain', 'Hello world')
 					.find('h2').should('contain', 'Hello world')
+				cy.closeInterceptedSession(readToken)
 
 				// Open read only for the second time
 				cy.reload()
 				cy.getEditor().should('be.visible')
 				cy.getContent()
 					.should('contain', 'Hello world')
 					.find('h2').should('contain', 'Hello world')
+				cy.closeInterceptedSession(readToken)
 
 				cy.login(user)
 				cy.shareFile('/test2.md', { edit: true })
@@ -94,40 +95,45 @@ describe('Test state loading of documents', function() {
 							.find('h2').should('contain', 'Hello world')
 						cy.getContent()
 							.type('Something new {end}')
+						cy.intercept({ method: 'POST', url: '**/session/*/push' }).as('push')
+						cy.intercept({ method: 'POST', url: '**/session/*/sync' }).as('sync')
 						cy.wait('@push')
 						cy.wait('@sync')
+						cy.closeInterceptedSession(writeToken)
 
 						// Reopen read only link and check if changes are there
 						cy.visit(`/s/${readToken}`)
 						cy.getEditor().should('be.visible')
 						cy.getContent()
 							.find('h2').should('contain', 'Something new Hello world')
-
 					})
 			})
 	})
 
 	it('Load after state has been saved', function() {
 		let readToken = null
 		let writeToken = null
+		cy.interceptCreate()
 		cy.shareFile('/test3.md', { edit: true })
 			.then((token) => {
 				writeToken = token
 				cy.logout()
 				cy.visit(`/s/${writeToken}`)
 			})
 			.then(() => {
-				// Open read only for the first time
+				// Open a file, write and save
 				cy.getEditor().should('be.visible')
 				cy.getContent()
 					.should('contain', 'Hello world')
 					.find('h2').should('contain', 'Hello world')
 				cy.getContent()
 					.type('Something new {end}')
+				cy.intercept({ method: 'POST', url: '**/session/*/save' }).as('save')
 				cy.get('.save-status button').click()
-				cy.wait('@save')
+				cy.wait('@save', { timeout: 10000 })
+				cy.closeInterceptedSession(writeToken)
 
-				// Open read only for the second time
+				// Open writable file again and assert the content
 				cy.reload()
 				cy.getEditor().should('be.visible')
 				cy.getContent()
@@ -142,11 +148,11 @@ describe('Test state loading of documents', function() {
 						cy.visit(`/s/${readToken}`)
 					})
 					.then(() => {
-						// Open read only for the first time
+						// Open read only file again and assert the content
 						cy.getEditor().should('be.visible')
 						cy.getContent()
 							.should('contain', 'Hello world')
-							.find('h2').should('contain', 'Hello world')
+							.find('h2').should('contain', 'Something new Hello world')
 					})
 			})
 	})

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -391,6 +391,36 @@ Cypress.Commands.add('closeFile', (params = {}) => {
 	cy.wait('@close', { timeout: 7000 })
 })
 
+let closeData = null
+Cypress.Commands.add('interceptCreate', () => {
+	return cy.intercept({ method: 'PUT', url: '**/session/*/create' }, (req) => {
+		closeData = {
+			url: ('' + req.url).replace('create', 'close'),
+		}
+		req.continue((res) => {
+			closeData = {
+				...closeData,
+				...res.body,
+			}
+		})
+	}).as('create')
+})
+
+Cypress.Commands.add('closeInterceptedSession', (shareToken = undefined) => {
+	return cy.window().then(win => {
+		return axios.post(
+			closeData.url,
+			{
+				documentId: closeData.session.documentId,
+				sessionId: closeData.session.id,
+				sessionToken: closeData.session.token,
+				token: shareToken,
+			},
+			{ headers: { requesttoken: win.OC.requestToken } },
+		)
+	})
+})
+
 Cypress.Commands.add('getFile', fileName => {
 	return cy.get(`[data-cy-files-list] tr[data-cy-files-list-row-name="${fileName}"]`)