Merge pull request #6900 from nextcloud/backport/6898/stable31

[stable31] fix/use e2e test server

cypress.config.mjs

@@ -32,6 +32,24 @@ export default defineConfig({
 			cypressSplit(on, config)
 			configureVisualRegression(on)
 
+			// Disable spell checking to prevent rendering differences
+			on('before:browser:launch', (browser, launchOptions) => {
+				if (browser.family === 'chromium' && browser.name !== 'electron') {
+					launchOptions.preferences.default['browser.enable_spellchecking'] = false
+					return launchOptions
+				}
+
+				if (browser.family === 'firefox') {
+					launchOptions.preferences['layout.spellcheckDefault'] = 0
+					return launchOptions
+				}
+
+				if (browser.name === 'electron') {
+					launchOptions.preferences.spellcheck = false
+					return launchOptions
+				}
+			})
+
 			return config
 		},
 

cypress/e2e/openreadonly.spec.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { User } from '@nextcloud/cypress'
+import { User } from '@nextcloud/e2e-test-server/cypress'
 import { randUser } from '../utils/index.js'
 
 const admin = new User('admin', 'admin')

cypress/e2e/print.spec.js

@@ -26,7 +26,7 @@ describe('Open print.md and compare print view', function() {
 			.get('h1:not(.hidden-visually)').should('contain', 'Print test')
 			.should('be.visible')
 
-		cy.compareSnapshot('print view in viewer', { capture: 'fullPage' })
+		cy.compareSnapshot('print view in viewer')
 		cy.setCssMedia('screen')
 	})
 
@@ -45,7 +45,7 @@ describe('Open print.md and compare print view', function() {
 					.get('h1:not(.hidden-visually)').should('contain', 'Print test')
 					.should('be.visible')
 
-				cy.compareSnapshot('print view in single-file share', { capture: 'fullPage' })
+				cy.compareSnapshot('print view in single-file share')
 				cy.setCssMedia('screen')
 			})
 	})

cypress/support/commands.js

@@ -5,13 +5,13 @@
 
 import axios from '@nextcloud/axios'
 import { emit } from '@nextcloud/event-bus'
-import { addCommands } from '@nextcloud/cypress'
+import { addCommands } from '@nextcloud/e2e-test-server/cypress'
 import { addCompareSnapshotCommand } from 'cypress-visual-regression/dist/command'
 
 // eslint-disable-next-line no-unused-vars,n/no-extraneous-import
 import regeneratorRuntime from 'regenerator-runtime'
 
-addCompareSnapshotCommand()
+addCompareSnapshotCommand({ capture: 'fullPage' })
 
 const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
 Cypress.env('baseUrl', url)
@@ -27,36 +27,8 @@ window._oc_webroot = url
 
 addCommands()
 
-// Copy of the new login command as long as we are blocked to upgrade @nextcloud/cypress by cypress crashes
-const login = function(user) {
-	cy.session(user, function() {
-		cy.request('/csrftoken').then(({ body }) => {
-			const requestToken = body.token
-			cy.request({
-				method: 'POST',
-				url: '/login',
-				body: {
-					user: user.userId,
-					password: user.password,
-					requesttoken: requestToken,
-				},
-				headers: {
-					'Content-Type': 'application/x-www-form-urlencoded',
-					// Add the Origin header so that the request is not blocked by the browser.
-					Origin: (Cypress.config('baseUrl') ?? '').replace('index.php/', ''),
-				},
-				followRedirect: false,
-			})
-		})
-	}, {
-		validate() {
-			cy.request('/apps/files').its('status').should('eq', 200)
-		},
-	})
-}
-
 // Prepare the csrf-token for axios
-Cypress.Commands.overwrite('login', (_login, user) => {
+Cypress.Commands.overwrite('login', (login, user) => {
 	cy.window(silent).then((win) => {
 		win.location.href = 'about:blank'
 	})

cypress/utils/index.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { User } from '@nextcloud/cypress'
+import { User } from '@nextcloud/e2e-test-server/cypress'
 
 export const getSearchParams = url => {
 	return url