From 2abb911369bcdbd328266fc21abb7e0aec91e406 Mon Sep 17 00:00:00 2001 From: Keith Grant Date: Wed, 22 May 2024 12:59:52 -0700 Subject: [PATCH] update urls in tests --- .../awx/administration/instanceGroups.cy.ts | 36 +++++++++---------- cypress/e2e/awx/resources/jobTemplates.cy.ts | 14 ++++---- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/cypress/e2e/awx/administration/instanceGroups.cy.ts b/cypress/e2e/awx/administration/instanceGroups.cy.ts index efba35844d..d665eff17d 100644 --- a/cypress/e2e/awx/administration/instanceGroups.cy.ts +++ b/cypress/e2e/awx/administration/instanceGroups.cy.ts @@ -74,8 +74,7 @@ instanceGroupTypes.forEach((igType) => { cy.verifyPageTitle(name); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes(`infrastructure/instance_groups/${igType.toLowerCase()}-group`)) - .to.be.true; + expect(currentUrl.includes(`infrastructure/instance-groups`)).to.be.true; }); if (igType === 'Instance') { cy.getByDataCy('policy-instance-minimum').should('have.text', '1'); @@ -270,8 +269,7 @@ instanceGroupTypes.forEach((igType) => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes(`infrastructure/instance_groups/${igType.toLowerCase()}-group`)) - .to.be.true; + expect(currentUrl.includes(`infrastructure/instance-groups`)).to.be.true; }); cy.getByDataCy(`edit-${igType.toLowerCase()}-group`).click(); cy.get('[data-cy="name"]').clear(); @@ -323,7 +321,7 @@ instanceGroupTypes.forEach((igType) => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes(`infrastructure/instance_groups/${igType.toLowerCase()}-group`)) + expect(currentUrl.includes(`infrastructure/instance-groups/${igType.toLowerCase()}-group`)) .to.be.true; }); cy.clickPageAction(`delete-${igType.toLowerCase()}-group`); @@ -390,7 +388,7 @@ instanceGroupTypes.forEach((igType) => { }); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes(`infrastructure/instance_groups/${igType.toLowerCase()}-group`)) + expect(currentUrl.includes(`infrastructure/instance-groups/${igType.toLowerCase()}-group`)) .to.be.true; }); cy.clickTab(/^Team access$/, true); @@ -400,7 +398,7 @@ instanceGroupTypes.forEach((igType) => { cy.get('.pf-v5-c-empty-state__body').contains(/^Add a role by clicking the button below./); cy.getByDataCy('add-roles').click(); cy.url().then((currentUrl) => { - expect(currentUrl.includes('infrastructure/instance_groups/')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups/')).to.be.true; expect(currentUrl.includes('instance-groups/teams/add-teams')).to.be.true; }); cy.get('[data-cy="wizard-nav"] li').eq(0).should('contain.text', 'Select team(s)'); @@ -439,7 +437,7 @@ instanceGroupTypes.forEach((igType) => { expect(response?.statusCode).to.eql(201); }); cy.visit( - `/infrastructure/instance_groups/${igType.toLowerCase()}-groups/${instanceGroup.id}/team-access` + `/infrastructure/instance-groups/${igType.toLowerCase()}-groups/${instanceGroup.id}/team-access` ); cy.verifyPageTitle(instanceGroup.name); cy.get('[data-cy="text-input"]').find('input').type(team.name); @@ -508,7 +506,7 @@ instanceGroupTypes.forEach((igType) => { }); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes(`infrastructure/instance_groups/${igType.toLowerCase()}-group`)) + expect(currentUrl.includes(`infrastructure/instance-groups/${igType.toLowerCase()}-group`)) .to.be.true; }); cy.clickTab(/^User access$/, true); @@ -518,7 +516,7 @@ instanceGroupTypes.forEach((igType) => { cy.get('.pf-v5-c-empty-state__body').contains(/^Add a role by clicking the button below./); cy.getByDataCy('add-roles').click(); cy.url().then((currentUrl) => { - expect(currentUrl.includes('infrastructure/instance_groups/')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups/')).to.be.true; expect(currentUrl.includes('instance-groups/users/add-users')).to.be.true; }); cy.get('[data-cy="wizard-nav"] li').eq(0).should('contain.text', 'Select user(s)'); @@ -556,7 +554,7 @@ instanceGroupTypes.forEach((igType) => { expect(response?.statusCode).to.eql(201); }); cy.visit( - `/infrastructure/instance_groups/${igType.toLowerCase()}-groups/${instanceGroup.id}/user-access` + `/infrastructure/instance-groups/${igType.toLowerCase()}-groups/${instanceGroup.id}/user-access` ); cy.verifyPageTitle(instanceGroup.name); cy.get('[data-cy="text-input"]').find('input').type(user.username); @@ -633,7 +631,7 @@ describe('Instance Groups: Jobs Tab', () => { }); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups/container-group')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.clickTab(/^Jobs$/, true); cy.filterTableBySingleSelect('name', job_template.name); @@ -700,7 +698,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.clickTab(/^Instances$/, true); @@ -713,7 +711,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('header').contains('Select instances'); cy.get('button').contains('Confirm').should('have.attr', 'aria-disabled', 'true'); cy.filterTableBySingleSelect('hostname', instance.hostname); - cy.intercept('POST', awxAPI`/instance_groups/${instanceGroup.id.toString()}/instances/`).as( + cy.intercept('POST', awxAPI`/instance-groups/${instanceGroup.id.toString()}/instances/`).as( 'associateInstance' ); cy.getByDataCy('checkbox-column-cell').find('input').click(); @@ -764,7 +762,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.clickTab(/^Instances$/, true); cy.get('[data-ouia-component-id="simple-table"]').within(() => { @@ -812,7 +810,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.clickTab(/^Instances$/, true); cy.get('button').contains('Run health check').should('have.attr', 'aria-disabled', 'true'); @@ -849,7 +847,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.clickTab(/^Instances$/, true); cy.get('[data-ouia-component-id="simple-table"]').within(() => { @@ -873,7 +871,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.clickTab(/^Instances$/, true); cy.get('[data-ouia-component-id="simple-table"]').within(() => { @@ -883,7 +881,7 @@ describe('Instance Groups: Instances Tab', () => { cy.get('[data-cy="name-column-cell"]').click(); cy.url().then((currentUrl) => { expect(currentUrl.includes('details')).to.be.true; - expect(currentUrl.includes('infrastructure/instance_groups')).to.be.true; + expect(currentUrl.includes('infrastructure/instance-groups')).to.be.true; }); cy.verifyPageTitle(instance.hostname); cy.contains('nav[aria-label="Breadcrumb"]', 'Instance groups').should('exist'); diff --git a/cypress/e2e/awx/resources/jobTemplates.cy.ts b/cypress/e2e/awx/resources/jobTemplates.cy.ts index 26e7bb9a1a..105414471a 100644 --- a/cypress/e2e/awx/resources/jobTemplates.cy.ts +++ b/cypress/e2e/awx/resources/jobTemplates.cy.ts @@ -318,7 +318,7 @@ describe('Job Templates Tests', function () { (inv) => { inventory2 = inv; - cy.visit(`templates/job_template/${jobTemplate.id}/details`); + cy.visit(`templates/job-template/${jobTemplate.id}/details`); cy.contains(jobTemplate.name); cy.getByDataCy('inventory').contains(jobTemplate.summary_fields.inventory.name).click(); @@ -330,7 +330,7 @@ describe('Job Templates Tests', function () { cy.clickModalButton('Delete inventory'); cy.wait('@deleteInventory'); - cy.visit(`templates/job_template/${jobTemplate.id}/details`); + cy.visit(`templates/job-template/${jobTemplate.id}/details`); cy.contains(jobTemplate.name); cy.getByDataCy('inventory').contains('Deleted'); cy.clickLink('Edit template'); @@ -345,10 +345,10 @@ describe('Job Templates Tests', function () { ); }); - it('can edit a job template to enable provisioning callback and and enable webhook, then edit again to disable those options', function () { + it('can edit a job template to enable provisioning callback and enable webhook, then edit again to disable those options', function () { const jtURL = document.location.origin + awxAPI`/job_templates/${jobTemplate.id.toString()}`; - cy.visit(`templates/job_template/${jobTemplate.id}/details`); + cy.visit(`templates/job-template/${jobTemplate.id}/details`); cy.get('[data-cy="enabled-options"]').should('not.exist'); cy.clickLink('Edit template'); @@ -432,7 +432,7 @@ describe('Job Templates Tests', function () { let webhookKey: string; cy.intercept('GET', awxAPI`/credential_types/*`).as('getCredTypes'); - cy.visit(`templates/job_template/${jobTemplate.id}/edit`); + cy.visit(`templates/job-template/${jobTemplate.id}/edit`); cy.getByDataCy('isWebhookEnabled').click(); cy.selectDropdownOptionByResourceName('webhook-service', 'GitHub'); @@ -572,7 +572,7 @@ describe('Job Templates Tests', function () { }); it('can copy an existing job template from the details page', function () { - cy.visit(`/templates/job_template/${jobTemplate.id.toString()}/details`); + cy.visit(`/templates/job-template/${jobTemplate.id.toString()}/details`); cy.intercept('POST', awxAPI`/job_templates/${jobTemplate.id.toString()}/copy/`).as( 'copyTemplate' ); @@ -581,7 +581,7 @@ describe('Job Templates Tests', function () { cy.wait('@copyTemplate') .its('response.body') .then(({ id, name }: { id: number; name: string }) => { - cy.visit(`/templates/job_template/${id}/details`); + cy.visit(`/templates/job-template/${id}/details`); cy.contains(name); }); });