Merge branch 'main' into dev

Assisted by [OpenAI](https://platform.openai.com/)

Assisted by [GitHub Copilot](https://github.com/features/copilot)

Author: lukaszgryglicki

tests/functional/cypress/e2e/v4/gitlab-repositories.cy.ts

@@ -45,7 +45,7 @@ describe('To Validate & Get the GitLab repositories of the project via API call'
     }
   });
 
-  it('Get the GitLab repositories of the project', function () {
+  const getGitLabRepositories = () =>
     cy.request({
       method: 'GET',
       url: `${claEndpoint}`,
@@ -55,7 +55,46 @@ describe('To Validate & Get the GitLab repositories of the project via API call'
       auth: {
         bearer: bearerToken,
       },
-    }).then((response) => {
+    });
+
+  const findGitLabRepositoryByExternalId = (list: any[], targetRepositoryExternalId: string) =>
+    list.find((item: any) => `${item.repository_external_id}` === `${targetRepositoryExternalId}`);
+
+  const waitForGitLabRepositoryState = (
+    targetRepositoryExternalId: string,
+    expectedEnabled: boolean,
+    retries: number = 6,
+  ): Cypress.Chainable<any> => {
+    const attempt = (remaining: number): Cypress.Chainable<any> =>
+      getGitLabRepositories().then((response) => {
+        validate_200_Status(response);
+        const list = response.body.list || [];
+        const repository = findGitLabRepositoryByExternalId(list, targetRepositoryExternalId);
+
+        expect(repository, `GitLab repository ${targetRepositoryExternalId} should exist`).to.exist;
+
+        if (repository.enabled === expectedEnabled) {
+          return cy.wrap(repository);
+        }
+
+        if (remaining === 0) {
+          expect(repository.enabled).to.eql(expectedEnabled);
+          return cy.wrap(repository);
+        }
+
+        cy.task(
+          'log',
+          `GitLab repository ${targetRepositoryExternalId} currently has enabled=${repository.enabled}; waiting for enabled=${expectedEnabled}`,
+        );
+
+        return cy.wait(2000).then(() => attempt(remaining - 1));
+      });
+
+    return attempt(retries);
+  };
+
+  it('Get the GitLab repositories of the project', function () {
+    getGitLabRepositories().then((response) => {
       validate_200_Status(response);
       let list = response.body.list;
       for (let i = 0; i <= list.length - 1; i++) {
@@ -65,6 +104,8 @@ describe('To Validate & Get the GitLab repositories of the project via API call'
           break;
         }
       }
+      expect(repoExternalId, `expected a GitLab repository under organization ${gitLabOrgName}`).to.not.eql('');
+      expect(claGroupId, `expected a CLA group for organization ${gitLabOrgName}`).to.not.eql('');
       //To validate schema of response
       validateApiResponse('gitlab-repositories/getProjectGitLabRepositories.json', response.body);
     });
@@ -86,15 +127,9 @@ describe('To Validate & Get the GitLab repositories of the project via API call'
       },
     }).then((response) => {
       validate_200_Status(response);
-      let list = response.body.list;
-      for (let i = 0; i <= list.length - 1; i++) {
-        if (list[i].repository_organization_name === gitLabOrgName) {
-          expect(list[i].enabled).to.eql(false);
-          break;
-        }
-      }
       //To validate schema of response
       validateApiResponse('gitlab-repositories/enrollGitLabRepository.json', response.body);
+      return waitForGitLabRepositoryState(repoExternalId, false);
     });
   });
 
@@ -114,15 +149,9 @@ describe('To Validate & Get the GitLab repositories of the project via API call'
       },
     }).then((response) => {
       validate_200_Status(response);
-      let list = response.body.list;
-      for (let i = 0; i <= list.length - 1; i++) {
-        if (list[i].repository_organization_name === gitLabOrgName) {
-          expect(list[i].enabled).to.eql(true);
-          break;
-        }
-      }
       //To validate schema of response
       validateApiResponse('gitlab-repositories/enrollGitLabRepository.json', response.body);
+      return waitForGitLabRepositoryState(repoExternalId, true);
     });
   });
 

tests/functional/cypress/e2e/v4/signatures.cy.ts

@@ -59,6 +59,62 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
     }
   });
 
+  const getProjectCompanySignatures = () =>
+    cy.request({
+      method: 'GET',
+      url: `${claEndpoint}signatures/project/${projectSFID}/company/${companyID}`,
+      timeout: timeout,
+      failOnStatusCode: allowFail,
+      headers: getXACLHeader(),
+      auth: {
+        bearer: bearerToken,
+      },
+    });
+
+  const findProjectCompanySignature = (signatures: any[]) =>
+    signatures.find((item: any) => item.signatureID === signatureCclaID) || signatures[0];
+
+  const waitForDomainApprovalListState = (
+    domain: string,
+    shouldExist: boolean,
+    retries: number = 6,
+  ): Cypress.Chainable<any> => {
+    const attempt = (remaining: number): Cypress.Chainable<any> =>
+      getProjectCompanySignatures().then((response) => {
+        validate_200_Status(response);
+        const signatures = response.body.signatures || [];
+        const signature = findProjectCompanySignature(signatures);
+
+        expect(signature, `CCLA signature ${signatureCclaID} should exist`).to.exist;
+
+        const list = signature.domainApprovalList || [];
+        const isPresent = list.includes(domain);
+
+        if (isPresent === shouldExist) {
+          return cy.wrap(signature);
+        }
+
+        if (remaining === 0) {
+          if (shouldExist) {
+            expect(list).to.include(domain);
+          } else {
+            expect(list).to.not.include(domain);
+          }
+
+          return cy.wrap(signature);
+        }
+
+        cy.task(
+          'log',
+          `Domain ${domain} is currently ${isPresent ? 'present' : 'absent'} in the approval list; waiting for it to be ${shouldExist ? 'present' : 'absent'}`,
+        );
+
+        return cy.wait(2000).then(() => attempt(remaining - 1));
+      });
+
+    return attempt(retries);
+  };
+
   it('Returns a list of corporate contributor for the CLA Group', function () {
     let url = `${claEndpoint}cla-group/${claGroupID}/corporate-contributors?companyID=${companyID}&pageSize=100`;
     cy.task('log', 'Returns a list of corporate contributor for the CLA Group URL: ' + url);
@@ -778,8 +834,7 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
       return cy.logJson('response', response).then(() => {
         validate_200_Status(response);
         cy.task('log', 'domain ' + domainApprovalList + ' should be added to approval list');
-        let list = response.body.domainApprovalList;
-        expect(list).to.include(domainApprovalList);
+        return waitForDomainApprovalListState(domainApprovalList, true);
       });
     });
   });
@@ -801,10 +856,7 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
       return cy.logJson('response', response).then(() => {
         validate_200_Status(response);
         cy.task('log', 'domain ' + domainApprovalList + ' should be removed from approval list');
-        let list = response.body.domainApprovalList;
-        if (list != null && list.length > 0) {
-          expect(list).to.not.include(domainApprovalList);
-        }
+        return waitForDomainApprovalListState(domainApprovalList, false);
       });
     });
   });