fix: cypress config

Signed-off-by: skjnldsv <[email protected]>

.github/workflows/cypress.yml

@@ -91,7 +91,7 @@ jobs:
       matrix:
         # Run multiple copies of the current job in parallel
         # Please increase the number or runners as your tests suite grows
-        containers: ['component', '1', '2', '3']
+        containers: ['1', '2', '3']
 
     name: runner ${{ matrix.containers }}
 

cypress.config.ts

@@ -1,14 +1,10 @@
-
-import {
-	configureNextcloud,
-	startNextcloud,
-	stopNextcloud,
-	waitOnNextcloud,
-} from './cypress/dockerNode'
-import { defineConfig } from 'cypress'
-
-import browserify from '@cypress/browserify-preprocessor'
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import { configureNextcloud, startNextcloud, stopNextcloud, waitOnNextcloud } from '@nextcloud/cypress/docker'
 import { configureVisualRegression } from 'cypress-visual-regression/dist/plugin'
+import { defineConfig } from 'cypress'
 
 export default defineConfig({
 	projectId: 'okzqgr',
@@ -34,19 +30,18 @@ export default defineConfig({
 	// Visual regression testing
 	env: {
 		failSilently: false,
-		type: 'actual',
+		visualRegressionType: 'regression',
 	},
 	screenshotsFolder: 'cypress/snapshots/actual',
 	trashAssetsBeforeRuns: true,
 
 	e2e: {
+		// Disable session isolation
 		testIsolation: false,
 
 		// We've imported your old cypress plugins here.
 		// You may want to clean this up later by importing these.
 		async setupNodeEvents(on, config) {
-			// Fix browserslist extend https://github.com/cypress-io/cypress/issues/2983#issuecomment-570616682
-			on('file:preprocessor', browserify({ typescript: require.resolve('typescript') }))
 			configureVisualRegression(on)
 
 			// Disable spell checking to prevent rendering differences
@@ -69,22 +64,19 @@ export default defineConfig({
 
 			// Remove container after run
 			on('after:run', () => {
-				stopNextcloud()
+				if (!process.env.CI) {
+					stopNextcloud()
+				}
 			})
 
 			// Before the browser launches
 			// starting Nextcloud testing container
-			return startNextcloud(process.env.BRANCH)
-				.then((ip) => {
-					// Setting container's IP as base Url
-					config.baseUrl = `http://${ip}/index.php`
-					return ip
-				})
-				.then(waitOnNextcloud)
-				.then(() => configureNextcloud(process.env.BRANCH))
-				.then(() => {
-					return config
-				})
+			const ip = await startNextcloud(process.env.BRANCH || 'master')
+			// Setting container's IP as base Url
+			config.baseUrl = `http://${ip}/index.php`
+			await waitOnNextcloud(ip)
+			await configureNextcloud(['viewer'])
+			return config
 		},
 	},
 })

cypress/e2e/placesUtils.ts

@@ -13,5 +13,5 @@ export function navigateToPlace(locationName: string) {
 }
 
 export function runOccCommand(command: string) {
-	cy.exec(`docker exec --user www-data nextcloud-cypress-tests-photos php ./occ ${command}`)
+	cy.exec(`docker exec --user www-data nextcloud-cypress-tests_photos php ./occ ${command}`)
 }

cypress/tsconfig.json

@@ -1,4 +1,12 @@
 {
 	"extends": "../tsconfig.json",
-	"include": ["./**/*.ts"],
-}
+	"include": ["../*.ts", "."],
+	"compilerOptions": {
+		"rootDir": "..",
+		"types": [
+			"cypress",
+			"dockerode",
+			"node"
+		]
+	}
+}