Skip to content

Commit b96b280

Browse files
AlexSCoreyAlexSCorey
committed
fixes test failures
1 parent d2d2f49 commit b96b280

File tree

11 files changed

+28
-31
lines changed

11 files changed

+28
-31
lines changed

‎cypress/e2e/awx/resources/credentials.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,8 @@ describe('Credentials Tabbed View - Job Templates', () => {
610610
cy.getByDataCy('create-template').click();
611611
cy.verifyPageTitle('Create Job Template');
612612
cy.getByDataCy('name').type(jobTemplateName);
613-
cy.selectDropdownOptionByResourceName('inventory', awxInventory.name);
614-
cy.selectDropdownOptionByResourceName('project', `${(this.globalProject as Project).name}`);
613+
cy.singleSelectByDataCy('inventory', awxInventory.name);
614+
cy.singleSelectByDataCy('project', `${(this.globalProject as Project).name}`);
615615
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
616616
cy.selectItemFromLookupModal('credential-select', machineCredential.name);
617617
cy.getByDataCy('Submit').click();

‎cypress/e2e/awx/resources/executionEnvironments.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ describe('Execution Environments: Templates View', () => {
354354
cy.getByDataCy('create-template').click();
355355
cy.clickLink(/^Create job template$/);
356356
cy.getByDataCy('name').type(jtName);
357-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
358-
cy.selectDropdownOptionByResourceName('project', `${(this.globalProject as Project).name}`);
357+
cy.singleSelectByDataCy('inventory', inventory.name);
358+
cy.singleSelectByDataCy('project', `${(this.globalProject as Project).name}`);
359359
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
360360
cy.singleSelectBy('[data-cy="executionEnvironment"]', execEnvName);
361361

‎cypress/e2e/awx/resources/inventorySource.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe('Inventory Sources', () => {
7272
cy.getBy('[data-cy="name"]').type('project source');
7373
cy.selectDropdownOptionByResourceName('source_control_type', 'Sourced from a Project');
7474
cy.selectDropdownOptionByResourceName('project', project.name);
75-
cy.selectDropdownOptionByResourceName('inventory', 'Dockerfile');
75+
cy.singleSelectByDataCy('inventory', 'Dockerfile');
7676
cy.singleSelectBy('[data-cy="executionEnvironment-form-group"]', executionEnvironment.name);
7777
cy.get('[data-cy="credential-select-form-group"]')
7878
.click()
@@ -221,7 +221,7 @@ describe('Inventory Sources', () => {
221221
cy.getBy('[data-cy="overwrite_vars"]').check();
222222
cy.getBy('[data-cy="update_on_launch"]').check();
223223
cy.selectDropdownOptionByResourceName('project', project.name);
224-
cy.selectDropdownOptionByResourceName('inventory', 'Dockerfile');
224+
cy.singleSelectByDataCy('inventory', 'Dockerfile');
225225
cy.getBy('[data-cy="Submit"]').click();
226226
cy.wait('@editSource')
227227
.then((response) => {

‎cypress/e2e/awx/resources/jobTemplates.cy.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ describe('Job Templates Tests', function () {
5353
cy.clickLink(/^Create job template$/);
5454
cy.getBy('[data-cy="name"]').type(jtName);
5555
cy.getBy('[data-cy="description"]').type('This is a JT description');
56-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
57-
cy.selectDropdownOptionByResourceName('project', `${(this.globalProject as Project).name}`);
56+
cy.singleSelectByDataCy('inventory', inventory.name);
57+
cy.singleSelectByDataCy('project', `${(this.globalProject as Project).name}`);
5858
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
5959
cy.getBy('[data-cy="Submit"]').click();
6060
cy.wait('@createJT')
@@ -107,8 +107,8 @@ describe('Job Templates Tests', function () {
107107
cy.clickLink(/^Create job template$/);
108108
cy.getBy('[data-cy="name"]').type(jtName);
109109
cy.getBy('[data-cy="description"]').type('This is a JT description');
110-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
111-
cy.selectDropdownOptionByResourceName('project', proj.name);
110+
cy.singleSelectByDataCy('inventory', inventory.name);
111+
cy.singleSelectByDataCy('project', proj.name);
112112
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
113113
cy.getBy('[data-cy="Submit"]').click();
114114
cy.wait('@createJT');
@@ -128,7 +128,7 @@ describe('Job Templates Tests', function () {
128128
cy.getBy('[data-cy="name"]').type(jtName);
129129
cy.getBy('[data-cy="description"]').type('This is a JT with POL wizard description');
130130
cy.selectPromptOnLaunch('inventory');
131-
cy.selectDropdownOptionByResourceName('project', `${(this.globalProject as Project).name}`);
131+
cy.singleSelectByDataCy('project', `${(this.globalProject as Project).name}`);
132132
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
133133
cy.selectPromptOnLaunch('execution_environment');
134134
cy.selectPromptOnLaunch('credential');
@@ -142,7 +142,7 @@ describe('Job Templates Tests', function () {
142142
cy.filterTableByMultiSelect('name', [jtName]);
143143
cy.getTableRow('name', jtName, { disableFilter: true }).should('be.visible');
144144
cy.clickTableRowAction('name', jtName, 'launch-template', { disableFilter: true });
145-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
145+
cy.singleSelectByDataCy('inventory', inventory.name);
146146
cy.clickButton(/^Next/);
147147
cy.selectItemFromLookupModal('credential-select', machineCredential.name);
148148
cy.clickButton(/^Next/);
@@ -203,7 +203,7 @@ describe('Job Templates Tests', function () {
203203
cy.getBy('[data-cy="name"]').type(jtName);
204204
cy.getBy('[data-cy="description"]').type('This is a JT with POL wizard description');
205205
cy.selectPromptOnLaunch('inventory');
206-
cy.selectDropdownOptionByResourceName('project', `${(this.globalProject as Project).name}`);
206+
cy.singleSelectByDataCy('project', `${(this.globalProject as Project).name}`);
207207
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
208208
cy.selectPromptOnLaunch('execution_environment');
209209
cy.selectPromptOnLaunch('credential');
@@ -214,7 +214,7 @@ describe('Job Templates Tests', function () {
214214
.then((id: string) => {
215215
cy.verifyPageTitle(jtName);
216216
cy.clickButton(/^Launch template$/);
217-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
217+
cy.singleSelectByDataCy('inventory', inventory.name);
218218
cy.clickButton(/^Next/);
219219
cy.selectItemFromLookupModal('credential-select', machineCredential.name);
220220
cy.clickButton(/^Next/);
@@ -279,8 +279,8 @@ describe('Job Templates Tests', function () {
279279

280280
cy.visit('/templates/job-template/create');
281281
cy.getByDataCy('name').type(jtName);
282-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
283-
cy.selectDropdownOptionByResourceName('project', gitProject.name);
282+
cy.singleSelectByDataCy('inventory', inventory.name);
283+
cy.singleSelectByDataCy('project', gitProject.name);
284284
cy.selectDropdownOptionByResourceName('playbook', 'debug-loop.yml');
285285
cy.getByDataCy('allow_simultaneous').click();
286286
cy.clickButton('Create job template');
@@ -408,7 +408,7 @@ describe('Job Templates Tests', function () {
408408
cy.getByDataCy('inventory').contains('Deleted');
409409
cy.clickLink('Edit template');
410410

411-
cy.selectDropdownOptionByResourceName('inventory', inv.name);
411+
cy.singleSelectByDataCy('inventory', inv.name);
412412
cy.intercept('PATCH', awxAPI`/job_templates/${jobTemplate.id.toString()}/`).as('saveJT');
413413
cy.clickButton('Save job template');
414414
cy.wait('@saveJT');

‎cypress/e2e/awx/resources/projects.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ describe('Projects', () => {
635635
cy.selectTableRow(jobTemplate.name, false);
636636
cy.getBy('[data-cy="edit-template"]').click();
637637
cy.verifyPageTitle('Edit Job Template');
638-
cy.selectDropdownOptionByResourceName('project', newProject.name);
638+
cy.singleSelectByDataCy('project', newProject.name);
639639
cy.intercept('PATCH', awxAPI`/job_templates/${jobTemplate.id.toString()}/`).as('edited');
640640
cy.getByDataCy('Submit').click();
641641
cy.wait('@edited')

‎cypress/e2e/awx/resources/workflowJobTemplates.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Workflow Job Templates Tests', () => {
5353
});
5454
cy.get('[data-cy="description"]').type('this is a new description');
5555
cy.singleSelectBy('[data-cy="organization"]', organization.name);
56-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
56+
cy.singleSelectByDataCy('inventory', inventory.name);
5757
cy.get('[data-cy="limit"]').type('mock-limit');
5858
cy.get('[data-cy="scm-branch"]').type('mock-scm-branch');
5959
cy.selectDropdownOptionByResourceName('labels', label.name.toString());
@@ -92,7 +92,7 @@ describe('Workflow Job Templates Tests', () => {
9292
cy.get('[data-cy="name"]').type(jtName);
9393
cy.get('[data-cy="description"]').type('this is a description');
9494
cy.singleSelectBy('[data-cy="organization"]', organization.name);
95-
cy.selectDropdownOptionByResourceName('inventory', inventory.name);
95+
cy.singleSelectByDataCy('inventory', inventory.name);
9696
cy.get('[data-cy="limit"]').type('mock-limit');
9797
cy.get('[data-cy="scm-branch"]').type('mock-scm-branch');
9898
cy.selectDropdownOptionByResourceName('labels', label.name.toString());

‎cypress/e2e/awx/resources/workflowVisualizerCRUD.cy.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,7 @@ describe('Workflow Visualizer', () => {
201201
'Node type * Project Sync'
202202
);
203203
cy.selectDropdownOptionByResourceName('node-type', 'Inventory Source Sync');
204-
cy.selectDropdownOptionByResourceName(
205-
'inventory-source-select',
206-
`${inventorySource.name}`
207-
);
204+
cy.singleSelectByDataCy('inventory-source-select', `${inventorySource.name}`);
208205
cy.selectDropdownOptionByResourceName('node-convergence', 'All');
209206
cy.get('[data-cy="node-alias"]').type('Inventory Source Node');
210207
cy.clickButton('Next');

‎cypress/e2e/awx/views/schedules.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ describe.skip('Schedules - Create and Delete', function () {
156156
cy.verifyPageTitle('Schedules');
157157
cy.getBy('[data-cy="create-schedule"]').click();
158158
cy.selectDropdownOptionByResourceName('schedule_type', 'Inventory source');
159-
cy.selectDropdownOptionByResourceName('inventory', `${specificInventory.name}`);
159+
cy.singleSelectByDataCy('inventory', `${specificInventory.name}`);
160160
cy.selectDropdownOptionByResourceName(
161161
'inventory-source-select',
162162
`${specificInventorySource.name}`

‎frontend/awx/resources/templates/JobTemplateForm.cy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe('Create job template ', () => {
144144
cy.get('[data-cy="name"]').type('Test');
145145
cy.get('button[aria-describedby="job_type-form-group"]').click();
146146
cy.clickButton(/^Check$/);
147-
cy.selectDropdownOptionByResourceName('inventory', 'Demo Inventory');
147+
cy.singleSelectByDataCy('inventory', 'Demo Inventory');
148148
cy.selectDropdownOptionByResourceName('project', 'Demo Project').as('ProjectInput');
149149
cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
150150
cy.wait('@getInstanceGroups')

‎frontend/awx/resources/templates/WorkflowJobTemplateForm.cy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('Create job template ', () => {
4242
cy.mount(<CreateWorkflowJobTemplate />);
4343
cy.get('[data-cy="name"]').type('Test');
4444

45-
cy.selectDropdownOptionByResourceName('inventory', 'Demo Inventory');
45+
cy.singleSelectByDataCy('inventory', 'Demo Inventory');
4646

4747
cy.clickButton('Create workflow job template');
4848

0 commit comments

Comments
 (0)