fixes test failures

Author: AlexSCorey

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

@@ -656,184 +656,184 @@ describe('Credentials', () => {
       cy.getByDataCy('create-template').click();
       cy.verifyPageTitle('Create Job Template');
       cy.getByDataCy('name').type(jobTemplateName);
-      cy.selectDropdownOptionByResourceName('inventory', awxInventory.name);
-      cy.selectDropdownOptionByResourceName('project', `${project.name}`);
+      cy.singleSelectByDataCy('inventory', awxInventory.name);
+      cy.singleSelectByDataCy('project', `${(this.globalProject as Project).name}`);
       cy.selectDropdownOptionByResourceName('playbook', 'hello_world.yml');
-      cy.multiSelectByDataCy('credential', [machineCredential.name]);
+      cy.selectItemFromLookupModal('credential-select', machineCredential.name);
       cy.getByDataCy('Submit').click();
     });
   });
-});
-
-tag(['upstream'], () => {
-  //these tests will not work downstream
-  describe('Credentials Tabbed View - Team and User Access', () => {
-    let machineCredential: Credential;
-    let createdAwxUser: AwxUser;
-    let awxOrganization: Organization;
-    let awxTeam: Team;
 
-    beforeEach(() => {
-      cy.createAwxOrganization().then((awxOrg) => {
-        awxOrganization = awxOrg;
-        cy.createAwxUser({ organization: awxOrganization.id }).then((awxUser) => {
-          createdAwxUser = awxUser;
-          cy.createAWXCredential({
-            kind: 'machine',
-            organization: awxOrganization.id,
-            credential_type: 1,
-          }).then((cred) => {
-            machineCredential = cred;
+  tag(['upstream'], () => {
+    //these tests will not work downstream
+    describe('Credentials Tabbed View - Team and User Access', () => {
+      let machineCredential: Credential;
+      let createdAwxUser: AwxUser;
+      let awxOrganization: Organization;
+      let awxTeam: Team;
+
+      beforeEach(() => {
+        cy.createAwxOrganization().then((awxOrg) => {
+          awxOrganization = awxOrg;
+          cy.createAwxUser({ organization: awxOrganization.id }).then((awxUser) => {
+            createdAwxUser = awxUser;
+            cy.createAWXCredential({
+              kind: 'machine',
+              organization: awxOrganization.id,
+              credential_type: 1,
+            }).then((cred) => {
+              machineCredential = cred;
+            });
+          });
+          cy.createAwxTeam({ organization: awxOrganization.id }).then((createdAwxTeam) => {
+            awxTeam = createdAwxTeam;
           });
-        });
-        cy.createAwxTeam({ organization: awxOrganization.id }).then((createdAwxTeam) => {
-          awxTeam = createdAwxTeam;
         });
       });
-    });
 
-    afterEach(() => {
-      cy.deleteAwxCredential(machineCredential, { failOnStatusCode: false });
-      cy.deleteAwxUser(createdAwxUser, { failOnStatusCode: false });
-      cy.deleteAwxTeam(awxTeam, { failOnStatusCode: false });
-      cy.deleteAwxOrganization(awxOrganization, { failOnStatusCode: false });
-    });
-
-    function removeRoleFromListRow(roleName: string, assignmentType: string) {
-      cy.intercept('DELETE', awxAPI`/role_${assignmentType}_assignments/*`).as('deleteRole');
-      cy.clickTableRowPinnedAction(roleName, 'remove-role', false);
-      cy.getModal().within(() => {
-        cy.get('#confirm').click();
-        cy.clickButton(/^Remove role/);
-        cy.wait('@deleteRole')
-          .its('response')
-          .then((deleted) => {
-            expect(deleted?.statusCode).to.eql(204);
-            cy.contains(/^Success$/).should('be.visible');
-            cy.containsBy('button', /^Close$/).click();
-          });
+      afterEach(() => {
+        cy.deleteAwxCredential(machineCredential, { failOnStatusCode: false });
+        cy.deleteAwxUser(createdAwxUser, { failOnStatusCode: false });
+        cy.deleteAwxTeam(awxTeam, { failOnStatusCode: false });
+        cy.deleteAwxOrganization(awxOrganization, { failOnStatusCode: false });
       });
-    }
 
-    it('can create a new credential, assign a team and apply role(s)', () => {
-      cy.intercept('POST', awxAPI`/role_team_assignments/`).as('teamRoleAssignment');
-      cy.navigateTo('awx', 'credentials');
-      cy.filterTableByMultiSelect('name', [machineCredential.name]);
-      cy.clickTableRowLink('name', machineCredential.name, { disableFilter: true });
-      cy.clickTab('Team Access', true);
-      cy.getByDataCy('add-roles').click();
-      cy.verifyPageTitle('Add roles');
-      cy.getWizard().within(() => {
-        cy.contains('h1', 'Select team(s)').should('be.visible');
-        cy.filterTableByMultiSelect('name', [awxTeam.name]);
-        cy.selectTableRowByCheckbox('name', awxTeam.name, { disableFilter: true });
-        cy.clickButton(/^Next/);
-        cy.contains('h1', 'Select roles to apply').should('be.visible');
-        cy.filterTableByTextFilter('name', 'Credential Admin', {
-          disableFilterSelection: true,
+      function removeRoleFromListRow(roleName: string, assignmentType: string) {
+        cy.intercept('DELETE', awxAPI`/role_${assignmentType}_assignments/*`).as('deleteRole');
+        cy.clickTableRowPinnedAction(roleName, 'remove-role', false);
+        cy.getModal().within(() => {
+          cy.get('#confirm').click();
+          cy.clickButton(/^Remove role/);
+          cy.wait('@deleteRole')
+            .its('response')
+            .then((deleted) => {
+              expect(deleted?.statusCode).to.eql(204);
+              cy.contains(/^Success$/).should('be.visible');
+              cy.containsBy('button', /^Close$/).click();
+            });
         });
-        cy.selectTableRowByCheckbox('name', 'Credential Admin', {
-          disableFilter: true,
+      }
+
+      it('can create a new credential, assign a team and apply role(s)', () => {
+        cy.intercept('POST', awxAPI`/role_team_assignments/`).as('teamRoleAssignment');
+        cy.navigateTo('awx', 'credentials');
+        cy.filterTableByMultiSelect('name', [machineCredential.name]);
+        cy.clickTableRowLink('name', machineCredential.name, { disableFilter: true });
+        cy.clickTab('Team Access', true);
+        cy.getByDataCy('add-roles').click();
+        cy.verifyPageTitle('Add roles');
+        cy.getWizard().within(() => {
+          cy.contains('h1', 'Select team(s)').should('be.visible');
+          cy.filterTableByMultiSelect('name', [awxTeam.name]);
+          cy.selectTableRowByCheckbox('name', awxTeam.name, { disableFilter: true });
+          cy.clickButton(/^Next/);
+          cy.contains('h1', 'Select roles to apply').should('be.visible');
+          cy.filterTableByTextFilter('name', 'Credential Admin', {
+            disableFilterSelection: true,
+          });
+          cy.selectTableRowByCheckbox('name', 'Credential Admin', {
+            disableFilter: true,
+          });
+          cy.filterTableByTextFilter('name', 'Credential Use', {
+            disableFilterSelection: true,
+          });
+          cy.selectTableRowByCheckbox('name', 'Credential Use', {
+            disableFilter: true,
+          });
+          cy.clickButton(/^Next/);
+          cy.contains('h1', 'Review').should('be.visible');
+          cy.verifyReviewStepWizardDetails('teams', [awxTeam.name], '1');
+          cy.verifyReviewStepWizardDetails(
+            'awxRoles',
+            [
+              'Credential Admin',
+              'Has all permissions to a single credential',
+              'Credential Use',
+              'Has use permissions to a single credential',
+            ],
+            '2'
+          );
+          cy.clickButton(/^Finish/);
+          cy.wait('@teamRoleAssignment')
+            .its('response')
+            .then((response) => {
+              expect(response?.statusCode).to.eql(201);
+            });
         });
-        cy.filterTableByTextFilter('name', 'Credential Use', {
-          disableFilterSelection: true,
+        cy.getModal().within(() => {
+          cy.clickButton(/^Close$/);
         });
-        cy.selectTableRowByCheckbox('name', 'Credential Use', {
+        cy.getModal().should('not.exist');
+        cy.verifyPageTitle(machineCredential.name);
+        cy.selectTableRowByCheckbox('team-name', awxTeam.name, {
           disableFilter: true,
         });
-        cy.clickButton(/^Next/);
-        cy.contains('h1', 'Review').should('be.visible');
-        cy.verifyReviewStepWizardDetails('teams', [awxTeam.name], '1');
-        cy.verifyReviewStepWizardDetails(
-          'awxRoles',
-          [
-            'Credential Admin',
-            'Has all permissions to a single credential',
-            'Credential Use',
-            'Has use permissions to a single credential',
-          ],
-          '2'
-        );
-        cy.clickButton(/^Finish/);
-        cy.wait('@teamRoleAssignment')
-          .its('response')
-          .then((response) => {
-            expect(response?.statusCode).to.eql(201);
-          });
-      });
-      cy.getModal().within(() => {
-        cy.clickButton(/^Close$/);
-      });
-      cy.getModal().should('not.exist');
-      cy.verifyPageTitle(machineCredential.name);
-      cy.selectTableRowByCheckbox('team-name', awxTeam.name, {
-        disableFilter: true,
-      });
-      removeRoleFromListRow('Credential Admin', 'team');
-      cy.selectTableRowByCheckbox('team-name', awxTeam.name, {
-        disableFilter: true,
+        removeRoleFromListRow('Credential Admin', 'team');
+        cy.selectTableRowByCheckbox('team-name', awxTeam.name, {
+          disableFilter: true,
+        });
+        removeRoleFromListRow('Credential Use', 'team');
       });
-      removeRoleFromListRow('Credential Use', 'team');
-    });
 
-    it('can create a new credential, assign a user and apply role(s)', () => {
-      cy.intercept('POST', awxAPI`/role_user_assignments/`).as('userRoleAssignment');
-      cy.navigateTo('awx', 'credentials');
-      cy.filterTableByMultiSelect('name', [machineCredential.name]);
-      cy.clickTableRowLink('name', machineCredential.name, { disableFilter: true });
-      cy.clickTab('User Access', true);
-      cy.getByDataCy('add-roles').click();
-      cy.verifyPageTitle('Add roles');
-      cy.getWizard().within(() => {
-        cy.contains('h1', 'Select user(s)').should('be.visible');
-        cy.selectTableRowByCheckbox('username', createdAwxUser.username);
-        cy.clickButton(/^Next/);
-        cy.contains('h1', 'Select roles to apply').should('be.visible');
-        cy.filterTableByTextFilter('name', 'Credential Admin', {
-          disableFilterSelection: true,
+      it('can create a new credential, assign a user and apply role(s)', () => {
+        cy.intercept('POST', awxAPI`/role_user_assignments/`).as('userRoleAssignment');
+        cy.navigateTo('awx', 'credentials');
+        cy.filterTableByMultiSelect('name', [machineCredential.name]);
+        cy.clickTableRowLink('name', machineCredential.name, { disableFilter: true });
+        cy.clickTab('User Access', true);
+        cy.getByDataCy('add-roles').click();
+        cy.verifyPageTitle('Add roles');
+        cy.getWizard().within(() => {
+          cy.contains('h1', 'Select user(s)').should('be.visible');
+          cy.selectTableRowByCheckbox('username', createdAwxUser.username);
+          cy.clickButton(/^Next/);
+          cy.contains('h1', 'Select roles to apply').should('be.visible');
+          cy.filterTableByTextFilter('name', 'Credential Admin', {
+            disableFilterSelection: true,
+          });
+          cy.selectTableRowByCheckbox('name', 'Credential Admin', {
+            disableFilter: true,
+          });
+          cy.filterTableByTextFilter('name', 'Credential Use', {
+            disableFilterSelection: true,
+          });
+          cy.selectTableRowByCheckbox('name', 'Credential Use', {
+            disableFilter: true,
+          });
+          cy.clickButton(/^Next/);
+          cy.contains('h1', 'Review').should('be.visible');
+          cy.verifyReviewStepWizardDetails('users', [createdAwxUser.username], '1');
+          cy.verifyReviewStepWizardDetails(
+            'awxRoles',
+            [
+              'Credential Admin',
+              'Has all permissions to a single credential',
+              'Credential Use',
+              'Has use permissions to a single credential',
+            ],
+            '2'
+          );
+          cy.clickButton(/^Finish/);
+          cy.wait('@userRoleAssignment')
+            .its('response')
+            .then((response) => {
+              expect(response?.statusCode).to.eql(201);
+            });
         });
-        cy.selectTableRowByCheckbox('name', 'Credential Admin', {
-          disableFilter: true,
+        cy.getModal().within(() => {
+          cy.clickButton(/^Close$/);
         });
-        cy.filterTableByTextFilter('name', 'Credential Use', {
-          disableFilterSelection: true,
+        cy.getModal().should('not.exist');
+        cy.verifyPageTitle(machineCredential.name);
+        cy.selectTableRowByCheckbox('username', createdAwxUser.username, {
+          disableFilter: true,
         });
-        cy.selectTableRowByCheckbox('name', 'Credential Use', {
+        removeRoleFromListRow('Credential Admin', 'user');
+        cy.selectTableRowByCheckbox('username', createdAwxUser.username, {
           disableFilter: true,
         });
-        cy.clickButton(/^Next/);
-        cy.contains('h1', 'Review').should('be.visible');
-        cy.verifyReviewStepWizardDetails('users', [createdAwxUser.username], '1');
-        cy.verifyReviewStepWizardDetails(
-          'awxRoles',
-          [
-            'Credential Admin',
-            'Has all permissions to a single credential',
-            'Credential Use',
-            'Has use permissions to a single credential',
-          ],
-          '2'
-        );
-        cy.clickButton(/^Finish/);
-        cy.wait('@userRoleAssignment')
-          .its('response')
-          .then((response) => {
-            expect(response?.statusCode).to.eql(201);
-          });
-      });
-      cy.getModal().within(() => {
-        cy.clickButton(/^Close$/);
-      });
-      cy.getModal().should('not.exist');
-      cy.verifyPageTitle(machineCredential.name);
-      cy.selectTableRowByCheckbox('username', createdAwxUser.username, {
-        disableFilter: true,
-      });
-      removeRoleFromListRow('Credential Admin', 'user');
-      cy.selectTableRowByCheckbox('username', createdAwxUser.username, {
-        disableFilter: true,
+        removeRoleFromListRow('Credential Use', 'user');
       });
-      removeRoleFromListRow('Credential Use', 'user');
     });
   });
 });

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

@@ -77,7 +77,7 @@ describe.skip('Inventory Sources', () => {
           cy.getBy('[data-cy="name"]').type('project source');
           cy.selectDropdownOptionByResourceName('source_control_type', 'Sourced from a Project');
           cy.selectDropdownOptionByResourceName('project', project.name);
-          cy.selectDropdownOptionByResourceName('inventory', 'Dockerfile');
+          cy.singleSelectByDataCy('inventory', 'Dockerfile');
           cy.singleSelectBy(
             '[data-cy="executionEnvironment-form-group"]',
             executionEnvironment.name
@@ -165,7 +165,7 @@ describe.skip('Inventory Sources', () => {
       cy.getBy('[data-cy="overwrite_vars"]').check();
       cy.getBy('[data-cy="update_on_launch"]').check();
       cy.selectDropdownOptionByResourceName('project', project.name);
-      cy.selectDropdownOptionByResourceName('inventory', 'Dockerfile');
+      cy.singleSelectByDataCy('inventory', 'Dockerfile');
       cy.getBy('[data-cy="Submit"]').click();
       // Verify edited details
       cy.location('pathname').should('match', /\/details$/);