From 169b80302673cbe7c9938837fa845dc56de69b76 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Sun, 11 Feb 2024 13:35:28 +0100
Subject: [PATCH] test(cy): refactor to use aliases

Signed-off-by: Max <max@nextcloud.com>
---
 cypress/e2e/api/UsersApi.spec.js | 122 +++++++++++++++----------------
 1 file changed, 60 insertions(+), 62 deletions(-)

diff --git a/cypress/e2e/api/UsersApi.spec.js b/cypress/e2e/api/UsersApi.spec.js
index 9e68fcedd74..91082699ed0 100644
--- a/cypress/e2e/api/UsersApi.spec.js
+++ b/cypress/e2e/api/UsersApi.spec.js
@@ -33,74 +33,72 @@ describe('The user mention API', function() {
 		cy.prepareWindowForSessionApi()
 	})
 
-	let fileId
-	let requesttoken
-
 	beforeEach(function() {
 		cy.login(user)
-		cy.prepareSessionApi().then((token) => {
-			requesttoken = token
-			cy.uploadTestFile('test.md')
-				.then(id => {
-					fileId = id
-				})
-		})
+		cy.uploadTestFile('test.md').as('fileId')
+			.then(cy.createTextSession).as('connection')
+		cy.getRequestToken().as('requesttoken')
+	})
+
+	afterEach(function() {
+		cy.get('@connection').then(c => c.closed || c.close())
+	})
+
+	it('has a valid connection', function() {
+		cy.get('@connection')
+			.its('document.id')
+			.should('equal', this.fileId)
 	})
 
 	it('fetches users with valid session', function() {
-		cy.createTextSession(fileId).then(connection => {
-			cy.wrap(connection)
-				.its('document.id')
-				.should('equal', fileId)
-
-			const requestData = {
-				method: 'POST',
-				url: '/apps/text/api/v1/users',
-				body: {
-					documentId: connection.document.id,
-					sessionId: connection.session.id,
-					sessionToken: connection.session.token,
-					requesttoken,
-				},
-				failOnStatusCode: false,
+		const body = {
+			documentId: this.connection.document.id,
+			sessionId: this.connection.session.id,
+			sessionToken: this.connection.session.token,
+			requesttoken: this.requesttoken,
+		}
+		const requestData = {
+			method: 'POST',
+			url: '/apps/text/api/v1/users',
+			body,
+			failOnStatusCode: false,
+		}
+		const invalidRequestData = { ...requestData }
+
+		cy.request(requestData).then(({ status }) => {
+			expect(status).to.eq(200)
+
+			invalidRequestData.body = {
+				...requestData.body,
+				sessionToken: 'invalid',
+			}
+		})
+
+		cy.request(invalidRequestData).then(({ status }) => {
+			expect(status).to.eq(403)
+			invalidRequestData.body = {
+				...requestData.body,
+				sessionId: 0,
 			}
-			const invalidRequestData = { ...requestData }
-
-			cy.request(requestData).then(({ status }) => {
-				expect(status).to.eq(200)
-
-				invalidRequestData.body = {
-					...requestData.body,
-					sessionToken: 'invalid',
-				}
-			})
-
-			cy.request(invalidRequestData).then(({ status }) => {
-				expect(status).to.eq(403)
-				invalidRequestData.body = {
-					...requestData.body,
-					sessionId: 0,
-				}
-			})
-
-			cy.request(invalidRequestData).then(({ status }) => {
-				expect(status).to.eq(403)
-
-				invalidRequestData.body = {
-					...requestData.body,
-					documentId: 0,
-				}
-			})
-
-			cy.request(invalidRequestData).then(({ status }) => {
-				expect(status).to.eq(403)
-			})
-
-			cy.wrap(null).then(() => connection.close())
-
-			cy.request(requestData).then(({ status, body }) => {
-				expect(status).to.eq(403)
-			})
+		})
+
+		cy.request(invalidRequestData).then(({ status }) => {
+			expect(status).to.eq(403)
+
+			invalidRequestData.body = {
+				...requestData.body,
+				documentId: 0,
+			}
+		})
+
+		cy.request(invalidRequestData).then(({ status }) => {
+			expect(status).to.eq(403)
+		})
+
+		cy.then(() => this.connection.close())
+
+		cy.request(requestData).then(({ status, body }) => {
+			expect(status).to.eq(403)
 		})
 	})
 })