feat: fix gitlab tests

Signed-off-by: Andrada Nyirestyan <andrada.nyirestyan@snyk.io>
snyk · Sep 18, 2023 · a435ce5 · a435ce5
1 parent 6980abd
commit a435ce5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/test/lib/source-handlers/gitlab/list-repos.test.ts b/test/lib/source-handlers/gitlab/list-repos.test.ts
@@ -31,7 +31,7 @@ describe('listGitlabRepos', () => {
     const GITLAB_ORG_NAME = process.env.TEST_GITLAB_ORG_NAME;
     process.env.GITLAB_TOKEN = process.env.TEST_GITLAB_TOKEN;
     // shared-with-group project is shared with group snyk-test
-    const gitlabGroupName = 'snyk-test';
+    const gitlabGroupName = 'another-group-for-contract-tests';
     const repos = await listGitlabRepos(gitlabGroupName, GITLAB_BASE_URL);
     expect(
       repos.filter((r) => r.name === `${GITLAB_ORG_NAME}/shared-with-group`),
@@ -42,7 +42,7 @@ describe('listGitlabRepos', () => {
   it('list repos for a sub-group', async () => {
     const GITLAB_BASE_URL = process.env.TEST_GITLAB_BASE_URL;
     process.env.GITLAB_TOKEN = process.env.TEST_GITLAB_TOKEN;
-    const gitlabGroupName = 'snyk-fixtures/example-sub-group';
+    const gitlabGroupName = 'snyk-api-import-contract-tests/example-sub-group';
     const repos = await listGitlabRepos(gitlabGroupName, GITLAB_BASE_URL);
     expect(repos.length > 0).toBeTruthy();
   }, 10000);

diff --git a/test/scripts/fixtures/import-projects-gitlab.json b/test/scripts/fixtures/import-projects-gitlab.json
@@ -4,9 +4,9 @@
       "orgId": "74e2f385-a54f-491e-9034-76c53e72927a",
       "integrationId": "c1285fdd-fad5-472e-b515-127b60900965",
       "target": {
-        "name": "test-maven",
-        "branch": "develop",
-        "id": 226,
+        "name": "snyk-api-import-contract-tests/project-from-template",
+        "branch": "master",
+        "id": 28,
         "fork": false
       }
     }

diff --git a/test/scripts/import-projects.test.ts b/test/scripts/import-projects.test.ts
@@ -59,6 +59,7 @@ describe('Import projects script', () => {
       path.resolve(__dirname + `/fixtures/import-projects-gitlab.json`),
       __dirname,
     );
+
     expect(projects).not.toBe([]);
     expect(projects[0]).toMatchObject({
       projectUrl: expect.any(String),
@@ -70,7 +71,7 @@ describe('Import projects script', () => {
     const logFile = fs.readFileSync(logFiles.importLogPath, 'utf8');
     // Gitlab project
     expect(logFile).toMatch(
-      `"target":{"name":"test-maven","branch":"develop"}`,
+      `"target":{"name":"snyk-api-import-contract-tests/project-from-template","branch":"master"}`,
     );
     discoveredProjects.push(...projects);
   }, 2400000);

diff --git a/test/system/fixtures/org-data/orgs.json b/test/system/fixtures/org-data/orgs.json
@@ -1,7 +1,7 @@
 {
   "orgData": [
     {
-      "name": "snyk-fixtures",
+      "name": "snyk-api-import-contract-tests",
       "orgId": "<snyk_org_id>",
       "integrations": {
         "gitlab": "<snyk_org_integration_id>"

diff --git a/test/system/orgs:data/gitlab.test.ts b/test/system/orgs:data/gitlab.test.ts
@@ -26,7 +26,7 @@ describe('General `snyk-api-import orgs:data <...>`', () => {
         expect(stderr).toEqual('');
         expect(err).toBeNull();
         expect(stdout).toMatch(
-          'Found 15 group(s). Written the data to file: group-hello-gitlab-orgs.json',
+          'Found 3 group(s). Written the data to file: group-hello-gitlab-orgs.json',
         );
         deleteFiles([
           path.resolve(__dirname, `group-${groupId}-gitlab-orgs.json`),