diff --git a/cypress/e2e/po/components/async-button.po.ts b/cypress/e2e/po/components/async-button.po.ts index bec77a692c5..773984c37aa 100644 --- a/cypress/e2e/po/components/async-button.po.ts +++ b/cypress/e2e/po/components/async-button.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class AsyncButtonPo extends ComponentPo { click(): Cypress.Chainable { diff --git a/cypress/e2e/po/components/checkbox-input.po.ts b/cypress/e2e/po/components/checkbox-input.po.ts index d54405b5a12..4e713b6e7d2 100644 --- a/cypress/e2e/po/components/checkbox-input.po.ts +++ b/cypress/e2e/po/components/checkbox-input.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class CheckboxInputPo extends ComponentPo { /** diff --git a/cypress/e2e/po/components/component.po.ts b/cypress/e2e/po/components/component.po.ts index 80ab975b53e..8ecc68be66c 100644 --- a/cypress/e2e/po/components/component.po.ts +++ b/cypress/e2e/po/components/component.po.ts @@ -1,4 +1,4 @@ -import { CypressChainable } from '@/cypress/integration/po/po.types'; +import { CypressChainable } from '@/cypress/e2e/po/po.types'; export default class ComponentPo { public self: () => CypressChainable diff --git a/cypress/e2e/po/components/form.po.ts b/cypress/e2e/po/components/form.po.ts index 029cafa992e..d3303b6339e 100644 --- a/cypress/e2e/po/components/form.po.ts +++ b/cypress/e2e/po/components/form.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class FormPo extends ComponentPo { /** diff --git a/cypress/e2e/po/components/labeled-input.po.ts b/cypress/e2e/po/components/labeled-input.po.ts index 4ac0720cf32..9108264acc4 100644 --- a/cypress/e2e/po/components/labeled-input.po.ts +++ b/cypress/e2e/po/components/labeled-input.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class LabeledInputPo extends ComponentPo { /** diff --git a/cypress/e2e/po/components/password.po.ts b/cypress/e2e/po/components/password.po.ts index 447e4e47756..3832d65a75b 100644 --- a/cypress/e2e/po/components/password.po.ts +++ b/cypress/e2e/po/components/password.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class PasswordPo extends ComponentPo { /** diff --git a/cypress/e2e/po/components/radio-group-input.po.ts b/cypress/e2e/po/components/radio-group-input.po.ts index 7aa79e69feb..833edee05ab 100644 --- a/cypress/e2e/po/components/radio-group-input.po.ts +++ b/cypress/e2e/po/components/radio-group-input.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class RadioGroupInputPo extends ComponentPo { /** diff --git a/cypress/e2e/po/components/radio-input.po.ts b/cypress/e2e/po/components/radio-input.po.ts index e93ee16a260..c37d437e92d 100644 --- a/cypress/e2e/po/components/radio-input.po.ts +++ b/cypress/e2e/po/components/radio-input.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class RadioInputPo extends ComponentPo { /** diff --git a/cypress/e2e/po/pages/home.po.ts b/cypress/e2e/po/pages/home.po.ts index 6a3e8beb00e..7a0c4eb18ec 100644 --- a/cypress/e2e/po/pages/home.po.ts +++ b/cypress/e2e/po/pages/home.po.ts @@ -1,4 +1,4 @@ -import PagePo from '@/cypress/integration/po/pages/page.po'; +import PagePo from '@/cypress/e2e/po/pages/page.po'; export default class HomePagePo extends PagePo { static url: string = '/home' diff --git a/cypress/e2e/po/pages/login-page.po.ts b/cypress/e2e/po/pages/login-page.po.ts index dca0e19040d..783b296cd62 100644 --- a/cypress/e2e/po/pages/login-page.po.ts +++ b/cypress/e2e/po/pages/login-page.po.ts @@ -1,7 +1,7 @@ -import PagePo from '@/cypress/integration/po/pages/page.po'; -import LabeledInputPo from '@/cypress/integration/po/components/labeled-input.po'; -import AsyncButtonPo from '@/cypress/integration/po/components/async-button.po'; -import PasswordPo from '~/cypress/integration/po/components/password.po'; +import PagePo from '@/cypress/e2e/po/pages/page.po'; +import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po'; +import AsyncButtonPo from '@/cypress/e2e/po/components/async-button.po'; +import PasswordPo from '@/cypress/e2e/po/components/password.po'; export class LoginPagePo extends PagePo { static url: string = '/auth/login' diff --git a/cypress/e2e/po/pages/page.po.ts b/cypress/e2e/po/pages/page.po.ts index 66530946da1..5926814a903 100644 --- a/cypress/e2e/po/pages/page.po.ts +++ b/cypress/e2e/po/pages/page.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class PagePo extends ComponentPo { constructor(private path: string, selector: string = '.dashboard-root') { diff --git a/cypress/e2e/po/pages/rancher-setup-auth-verify.po.ts b/cypress/e2e/po/pages/rancher-setup-auth-verify.po.ts index 2dfab75e73f..6c3d950ab62 100644 --- a/cypress/e2e/po/pages/rancher-setup-auth-verify.po.ts +++ b/cypress/e2e/po/pages/rancher-setup-auth-verify.po.ts @@ -1,9 +1,9 @@ -import PagePo from '@/cypress/integration/po/pages/page.po'; -import LabeledInputPo from '@/cypress/integration/po/components/labeled-input.po'; -import CheckboxInputPo from '@/cypress/integration/po/components/checkbox-input.po'; -import RadioGroupInputPo from '@/cypress/integration/po/components/radio-group-input.po'; -import AsyncButtonPo from '@/cypress/integration/po/components/async-button.po'; -import PasswordPo from '~/cypress/integration/po/components/password.po'; +import PagePo from '@/cypress/e2e/po/pages/page.po'; +import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po'; +import CheckboxInputPo from '@/cypress/e2e/po/components/checkbox-input.po'; +import RadioGroupInputPo from '@/cypress/e2e/po/components/radio-group-input.po'; +import AsyncButtonPo from '@/cypress/e2e/po/components/async-button.po'; +import PasswordPo from '@/cypress/e2e/po/components/password.po'; export class RancherSetupAuthVerifyPage extends PagePo { static url: string = '/auth/login' diff --git a/cypress/e2e/po/pages/rancher-setup.po.ts b/cypress/e2e/po/pages/rancher-setup.po.ts index 1071ed755e3..c1726dddf70 100644 --- a/cypress/e2e/po/pages/rancher-setup.po.ts +++ b/cypress/e2e/po/pages/rancher-setup.po.ts @@ -1,7 +1,7 @@ -import PagePo from '@/cypress/integration/po/pages/page.po'; -import AsyncButtonPo from '@/cypress/integration/po/components/async-button.po'; -import FormPo from '@/cypress/integration/po/components/form.po'; -import PasswordPo from '~/cypress/integration/po/components/password.po'; +import PagePo from '@/cypress/e2e/po/pages/page.po'; +import AsyncButtonPo from '@/cypress/e2e/po/components/async-button.po'; +import FormPo from '@/cypress/e2e/po/components/form.po'; +import PasswordPo from '@/cypress/e2e/po/components/password.po'; export class RancherSetupPagePo extends PagePo { static url: string = '/auth/login' diff --git a/cypress/e2e/po/side-bars/burger-side-menu.po.ts b/cypress/e2e/po/side-bars/burger-side-menu.po.ts index f113d32fb90..bda7986715b 100644 --- a/cypress/e2e/po/side-bars/burger-side-menu.po.ts +++ b/cypress/e2e/po/side-bars/burger-side-menu.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class BurgerMenuPo extends ComponentPo { constructor() { diff --git a/cypress/e2e/po/side-bars/page-actions.po.ts b/cypress/e2e/po/side-bars/page-actions.po.ts index 40081c94b5e..f3612e221c7 100644 --- a/cypress/e2e/po/side-bars/page-actions.po.ts +++ b/cypress/e2e/po/side-bars/page-actions.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class PageActionsPo extends ComponentPo { constructor() { diff --git a/cypress/e2e/po/side-bars/product-side-nav.po.ts b/cypress/e2e/po/side-bars/product-side-nav.po.ts index 7d29c87153b..d13233a7e54 100644 --- a/cypress/e2e/po/side-bars/product-side-nav.po.ts +++ b/cypress/e2e/po/side-bars/product-side-nav.po.ts @@ -1,4 +1,4 @@ -import ComponentPo from '@/cypress/integration/po/components/component.po'; +import ComponentPo from '@/cypress/e2e/po/components/component.po'; export default class ProductNavPo extends ComponentPo { constructor() { diff --git a/cypress/e2e/tests/navigation/page-actions.spec.ts b/cypress/e2e/tests/navigation/page-actions.spec.ts index cf3a8a844ad..2dfd35b562a 100644 --- a/cypress/e2e/tests/navigation/page-actions.spec.ts +++ b/cypress/e2e/tests/navigation/page-actions.spec.ts @@ -1,5 +1,5 @@ -import PageActions from '@/cypress/integration/po/side-bars/page-actions.po'; -import HomePagePo from '@/cypress/integration/po/pages/home.po'; +import PageActions from '@/cypress/e2e/po/side-bars/page-actions.po'; +import HomePagePo from '@/cypress/e2e/po/pages/home.po'; describe('Page Actions', () => { beforeEach(() => { diff --git a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts index b32d31c4b58..a94e73fa5c1 100644 --- a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts +++ b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts @@ -1,5 +1,5 @@ -import HomePagePo from '@/cypress/integration/po/pages/home.po'; -import BurgerMenuPo from '@/cypress/integration/po/side-bars/burger-side-menu.po'; +import HomePagePo from '@/cypress/e2e/po/pages/home.po'; +import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po'; Cypress.config(); describe('Side Menu: main', () => { diff --git a/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts b/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts index d72e495a739..8909489aab1 100644 --- a/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts +++ b/cypress/e2e/tests/navigation/side-nav/product-side-nav.spec.ts @@ -1,6 +1,6 @@ -import HomePagePo from '@/cypress/integration/po/pages/home.po'; -import BurgerMenuPo from '@/cypress/integration/po/side-bars/burger-side-menu.po'; -import ProductNavPo from '@/cypress/integration/po/side-bars/product-side-nav.po'; +import HomePagePo from '@/cypress/e2e/po/pages/home.po'; +import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po'; +import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po'; Cypress.config(); describe('Side navigation: Cluster ', () => { diff --git a/cypress/e2e/tests/pages/home.spec.ts b/cypress/e2e/tests/pages/home.spec.ts index 5eb9947d036..f6202d5affe 100644 --- a/cypress/e2e/tests/pages/home.spec.ts +++ b/cypress/e2e/tests/pages/home.spec.ts @@ -1,6 +1,6 @@ -import HomePagePo from '@/cypress/integration/po/pages/home.po'; -import BurgerMenuPo from '@/cypress/integration/po/side-bars/burger-side-menu.po'; -import PageActions from '@/cypress/integration/po/side-bars/page-actions.po'; +import HomePagePo from '@/cypress/e2e/po/pages/home.po'; +import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po'; +import PageActions from '@/cypress/e2e/po/side-bars/page-actions.po'; describe('Home Page', () => { beforeEach(() => { diff --git a/cypress/e2e/tests/pages/login.spec.ts b/cypress/e2e/tests/pages/login.spec.ts index 25d9aee14bd..86c8a1f2d47 100644 --- a/cypress/e2e/tests/pages/login.spec.ts +++ b/cypress/e2e/tests/pages/login.spec.ts @@ -1,4 +1,4 @@ -import { LoginPagePo } from '@/cypress/integration/po/pages/login-page.po'; +import { LoginPagePo } from '@/cypress/e2e/po/pages/login-page.po'; describe('Local authentication', () => { it('Log in with valid credentials', () => { diff --git a/cypress/e2e/tests/setup/rancher-setup.spec.ts b/cypress/e2e/tests/setup/rancher-setup.spec.ts index 51665b2cf9e..af4510b37af 100644 --- a/cypress/e2e/tests/setup/rancher-setup.spec.ts +++ b/cypress/e2e/tests/setup/rancher-setup.spec.ts @@ -1,5 +1,5 @@ -import { RancherSetupPagePo } from '@/cypress/integration/po/pages/rancher-setup.po'; -import { RancherSetupAuthVerifyPage } from '@/cypress/integration/po/pages/rancher-setup-auth-verify.po'; +import { RancherSetupPagePo } from '@/cypress/e2e/po/pages/rancher-setup.po'; +import { RancherSetupAuthVerifyPage } from '@/cypress/e2e/po/pages/rancher-setup-auth-verify.po'; describe('Rancher setup', () => { it('Requires initial setup', () => { diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 604dcd0b8bf..3702836580c 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -1,4 +1,4 @@ -import { LoginPagePo } from '@/cypress/integration/po/pages/login-page.po'; +import { LoginPagePo } from '@/cypress/e2e/po/pages/login-page.po'; /** * Login local authentication, including first login and bootstrap if not cached