diff --git a/libs/ui-lib-tests/cypress/integration/create-multinode/0-create-cluster.cy.ts b/libs/ui-lib-tests/cypress/integration/create-multinode/0-create-cluster.cy.ts index aaffb56f16..3ae88a17d4 100644 --- a/libs/ui-lib-tests/cypress/integration/create-multinode/0-create-cluster.cy.ts +++ b/libs/ui-lib-tests/cypress/integration/create-multinode/0-create-cluster.cy.ts @@ -14,7 +14,7 @@ describe(`Assisted Installer Multinode Cluster Installation`, () => { beforeEach(() => { setTestStartSignal(''); - cy.visit('/clusters'); + cy.visit('/assisted-installer/clusters'); }); describe('Creating a new cluster', () => { diff --git a/libs/ui-lib-tests/cypress/integration/create-sno/0-create-cluster.cy.ts b/libs/ui-lib-tests/cypress/integration/create-sno/0-create-cluster.cy.ts index 669e2838ff..c60f2f2396 100644 --- a/libs/ui-lib-tests/cypress/integration/create-sno/0-create-cluster.cy.ts +++ b/libs/ui-lib-tests/cypress/integration/create-sno/0-create-cluster.cy.ts @@ -15,7 +15,7 @@ describe(`Assisted Installer SNO Cluster Installation`, () => { beforeEach(() => { setTestStartSignal(''); - cy.visit('/clusters'); + cy.visit('/assisted-installer/clusters'); }); describe('Creating a new cluster', () => { @@ -23,7 +23,7 @@ describe(`Assisted Installer SNO Cluster Installation`, () => { clusterListPage.getCreateNewClusterButton().should('be.visible'); clusterListPage.getCreateNewClusterButton().click(); - cy.location('pathname').should('eq', Cypress.env('newClusterLocation')); + cy.location('pathname').should('eq', '/assisted-installer/clusters/~new'); }); it('Can submit the form to create a new cluster', () => { @@ -49,7 +49,7 @@ describe(`Assisted Installer SNO Cluster Installation`, () => { describe('When the cluster is created', () => { beforeEach(() => { setTestStartSignal('CLUSTER_CREATED'); - cy.visit('/clusters'); + cy.visit('/assisted-installer/clusters'); }); it('Lists the new cluster', () => { diff --git a/libs/ui-lib-tests/cypress/integration/static-ip/0-create-cluster.cy.ts b/libs/ui-lib-tests/cypress/integration/static-ip/0-create-cluster.cy.ts index 12935cbdcb..3c3611c897 100644 --- a/libs/ui-lib-tests/cypress/integration/static-ip/0-create-cluster.cy.ts +++ b/libs/ui-lib-tests/cypress/integration/static-ip/0-create-cluster.cy.ts @@ -15,7 +15,7 @@ describe(`Assisted Installer Static IP Cluster Creation`, () => { beforeEach(() => { setTestStartSignal(''); - cy.visit('/clusters'); + cy.visit('/assisted-installer/clusters'); }); describe('Creating a new cluster', () => { diff --git a/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-creation.cy.ts b/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-creation.cy.ts index 5e3f2d038f..e53d7487cf 100644 --- a/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-creation.cy.ts +++ b/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-creation.cy.ts @@ -14,7 +14,7 @@ describe('Assisted Installer UI behaviour - cluster creation', () => { beforeEach(() => { setTestStartSignal(''); - cy.visit('/clusters'); + cy.visit('/assisted-installer/clusters'); }); describe('OpenShiftVersion tests', () => { diff --git a/libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/with-custom-ocp-releases.cy.ts b/libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/with-custom-ocp-releases.cy.ts index 6f268fc8b2..a23320aa70 100644 --- a/libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/with-custom-ocp-releases.cy.ts +++ b/libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/with-custom-ocp-releases.cy.ts @@ -15,7 +15,7 @@ describe('Assisted Installer UI behaviour - cluster creation with custom OCP rel beforeEach(() => { setTestStartSignal(''); - cy.visit('/clusters'); + cy.visit('/assisted-installer/clusters'); }); describe('Custom OpenShiftVersion tests', () => { diff --git a/libs/ui-lib-tests/cypress/support/variables/cluster-details.ts b/libs/ui-lib-tests/cypress/support/variables/cluster-details.ts index 504d8b8761..1e1085d04f 100644 --- a/libs/ui-lib-tests/cypress/support/variables/cluster-details.ts +++ b/libs/ui-lib-tests/cypress/support/variables/cluster-details.ts @@ -18,7 +18,6 @@ Cypress.env('cpuArchitectureFieldHelperId', '#form-input-cpuArchitecture-field-h Cypress.env('pullSecretFieldHelperId', '#form-input-pullSecret-field-helper'); Cypress.env('clusterNameFieldHelperId', '#form-input-name-field-helper'); Cypress.env('baseDnsDomainFieldHelperId', '#form-input-baseDnsDomain-field-helper'); -Cypress.env('newClusterLocation', '/clusters/~new'); Cypress.env( 'staticIpNetworkConfigFieldId', '#form-radio-hostsNetworkConfigurationType-static-field', diff --git a/libs/ui-lib-tests/cypress/views/common.ts b/libs/ui-lib-tests/cypress/views/common.ts index 3dc0f97e43..de53603858 100644 --- a/libs/ui-lib-tests/cypress/views/common.ts +++ b/libs/ui-lib-tests/cypress/views/common.ts @@ -99,10 +99,10 @@ export const commonActions = { return cy.get('#form-input-dns-field-helper-error'); }, visitNewClusterPage: () => { - cy.visit('/clusters/~new'); + cy.visit('/assisted-installer/clusters/~new'); }, visitClusterDetailsPage: () => { - cy.visit(`/clusters/${Cypress.env('clusterId')}`); + cy.visit(`/assisted-installer/clusters/${Cypress.env('clusterId')}`); cy.get('h2').should('exist'); }, }; diff --git a/libs/ui-lib-tests/cypress/views/pages/ClusterPage.ts b/libs/ui-lib-tests/cypress/views/pages/ClusterPage.ts index be2d726799..86355d4550 100644 --- a/libs/ui-lib-tests/cypress/views/pages/ClusterPage.ts +++ b/libs/ui-lib-tests/cypress/views/pages/ClusterPage.ts @@ -10,7 +10,7 @@ export class ClusterPage { } static visit(options?: Partial) { - cy.visit(`/clusters/${Cypress.env('clusterId')}`, options); + cy.visit(`/assisted-installer/clusters/${Cypress.env('clusterId')}`, options); } get body() { diff --git a/libs/ui-lib-tests/cypress/views/pages/NewClusterPage.ts b/libs/ui-lib-tests/cypress/views/pages/NewClusterPage.ts index 3d29bbbdbc..4b3d07e091 100644 --- a/libs/ui-lib-tests/cypress/views/pages/NewClusterPage.ts +++ b/libs/ui-lib-tests/cypress/views/pages/NewClusterPage.ts @@ -1,5 +1,5 @@ export class NewClusterPage { static visit(options?: Partial) { - return cy.visit('/clusters/~new', options); + return cy.visit('/assisted-installer/clusters/~new', options); } }