Added integration test for CI_PROJECT_DIR (predefined variable)

Author: firecow

src/job.ts

@@ -79,13 +79,20 @@ export class Job {
         this.environment = typeof jobData.environment === "string" ? {name: jobData.environment} : jobData.environment;
         this.cache = jobData.cache || null;
 
+        let CI_PROJECT_DIR = `${this.cwd}`;
+        if (this.imageName) {
+            CI_PROJECT_DIR = `/builds/${this.safeJobName}`;
+        } else if (this.shellIsolation) {
+            CI_PROJECT_DIR = `${this.cwd}/.gitlab-ci-local/builds/${this.safeJobName}`;
+        }
+
         const predefinedVariables = {
             GITLAB_USER_LOGIN: gitData.user["GITLAB_USER_LOGIN"],
             GITLAB_USER_EMAIL: gitData.user["GITLAB_USER_EMAIL"],
             GITLAB_USER_NAME: gitData.user["GITLAB_USER_NAME"],
             CI_COMMIT_SHORT_SHA: gitData.commit.SHORT_SHA, // Changes
             CI_COMMIT_SHA: gitData.commit.SHA,
-            CI_PROJECT_DIR: this.imageName ? `/builds/${this.safeJobName}` : `${this.cwd}`,
+            CI_PROJECT_DIR,
             CI_PROJECT_NAME: gitData.remote.project,
             CI_PROJECT_TITLE: `${camelCase(gitData.remote.project)}`,
             CI_PROJECT_PATH: gitData.CI_PROJECT_PATH,

tests/test-cases/predefined-variables/.gitlab-ci.yml

@@ -4,3 +4,4 @@ test-job:
     - echo ${CI_PROJECT_NAME}
     - echo ${CI_PROJECT_PATH_SLUG}
     - echo ${CI_PROJECT_NAMESPACE}
+    - echo ${CI_PROJECT_DIR}

tests/test-cases/predefined-variables/integration.predefined-variables.test.ts

@@ -12,5 +12,18 @@ test("predefined-variables <test-job>", async () => {
     expect(writeStreams.stdoutLines[3]).toEqual(chalk`{blueBright test-job} {greenBright >} predefined-variables`);
     expect(writeStreams.stdoutLines[5]).toEqual(chalk`{blueBright test-job} {greenBright >} gcl-predefined-variables`);
     expect(writeStreams.stdoutLines[7]).toEqual(chalk`{blueBright test-job} {greenBright >} gcl`);
+    expect(writeStreams.stdoutLines[9]).toEqual(chalk`{blueBright test-job} {greenBright >} tests/test-cases/predefined-variables`);
+    expect(writeStreams.stderrLines).toEqual([]);
+});
+
+test("predefined-variables <test-job> --shell-isolation", async () => {
+    const writeStreams = new MockWriteStreams();
+    await handler({
+        cwd: "tests/test-cases/predefined-variables",
+        jobs: ["test-job"],
+        shellIsolation: true,
+    }, writeStreams);
+
+    expect(writeStreams.stdoutLines[9]).toEqual(chalk`{blueBright test-job} {greenBright >} tests/test-cases/predefined-variables/.gitlab-ci-local/builds/test-job`);
     expect(writeStreams.stderrLines).toEqual([]);
 });