1 files changed, 20 insertions, 22 deletions
diff --git a/cypress/support/component.ts b/cypress/support/component.ts
index 765ed6155f9..853609bb4dd 100644
--- a/cypress/support/component.ts
+++ b/cypress/support/component.ts
@@ -2,34 +2,27 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
+import '@testing-library/cypress/add-commands'
 import 'cypress-axe'
 
+// styles
+import '../../apps/theming/css/default.css'
+import '../../core/css/server.css'
+
 /* eslint-disable */
 import { mount } from '@cypress/vue2'
 
-// Example use:
-// cy.mount(MyComponent)
-Cypress.Commands.add('mount', (component, optionsOrProps) => {
-	let instance = null
-	const oldMounted = component?.mounted || false
-
-	// Override the mounted method to expose
-	// the component instance to cypress
-	component.mounted = function() {
-		// eslint-disable-next-line
-		instance = this
-		if (oldMounted) {
-			oldMounted.call(instance)
-		}
-	}
-
-	// Expose the component with cy.get('@component')
-	return mount(component, optionsOrProps).then(() => {
-		return cy.wrap(instance).as('component')
-	})
+Cypress.Commands.add('mount', (component, options = {}) => {
+	// Setup options object
+	options.extensions = options.extensions || {}
+	options.extensions.plugins = options.extensions.plugins || []
+	options.extensions.components = options.extensions.components || {}
+
+	return mount(component, options)
 })
 
-Cypress.Commands.add('mockInitialState', (app: string, key: string, value: any) => {
+Cypress.Commands.add('mockInitialState', (app: string, key: string, value: unknown) => {
 	cy.document().then(($document) => {
 		const input = $document.createElement('input')
 		input.setAttribute('type', 'hidden')
@@ -40,8 +33,13 @@ Cypress.Commands.add('mockInitialState', (app: string, key: string, value: any)
 })
 
 Cypress.Commands.add('unmockInitialState', (app?: string, key?: string) => {
+	cy.window().then(($window) => {
+		// @ts-expect-error internal value
+		delete $window._nc_initial_state
+	})
+
 	cy.document().then(($document) => {
 		$document.querySelectorAll('body > input[type="hidden"]' + (app ? `[id="initial-state-${app}-${key}"]` : ''))
 			.forEach((node) => $document.body.removeChild(node))
 	})
-})
-\ No newline at end of file
+})