Skip to content

Commit

Permalink
Correct imports within the Cypress tests
Browse files Browse the repository at this point in the history
  • Loading branch information
cnotv committed Jul 26, 2022
1 parent 42c3ab3 commit 454f3d1
Show file tree
Hide file tree
Showing 23 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/async-button.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/checkbox-input.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/component.po.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/form.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/labeled-input.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/password.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/radio-group-input.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/components/radio-input.po.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/pages/home.po.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
8 changes: 4 additions & 4 deletions cypress/e2e/po/pages/login-page.po.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/pages/page.po.ts
Original file line number Diff line number Diff line change
@@ -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') {
Expand Down
12 changes: 6 additions & 6 deletions cypress/e2e/po/pages/rancher-setup-auth-verify.po.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
8 changes: 4 additions & 4 deletions cypress/e2e/po/pages/rancher-setup.po.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/side-bars/burger-side-menu.po.ts
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/side-bars/page-actions.po.ts
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/po/side-bars/product-side-nav.po.ts
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tests/navigation/page-actions.spec.ts
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 ', () => {
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/tests/pages/home.spec.ts
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/login.spec.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tests/setup/rancher-setup.spec.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 454f3d1

Please sign in to comment.