Skip to content

Commit

Permalink
update urls in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@keithjgrant
keithjgrant committed May 23, 2024
1 parent 4f822ea commit 2abb911
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 26 deletions.
36 changes: 17 additions & 19 deletions cypress/e2e/awx/administration/instanceGroups.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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`);
Expand Down Expand Up @@ -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);
Expand All @@ -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)');
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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)');
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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();
Expand Down Expand Up @@ -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(() => {
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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(() => {
Expand All @@ -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(() => {
Expand All @@ -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');
Expand Down
14 changes: 7 additions & 7 deletions cypress/e2e/awx/resources/jobTemplates.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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');
Expand All @@ -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');

Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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'
);
Expand All @@ -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);
});
});
Expand Down

0 comments on commit 2abb911

Please sign in to comment.