improve custom step identifier type

Expensify · Jun 14, 2024 · d7b053c · d7b053c
1 parent 852ef29
commit d7b053c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/src/types/modules/act.d.ts b/src/types/modules/act.d.ts
@@ -1,4 +1,4 @@
-import type {StepIdentifier as ActStepIdentifier, GithubWorkflowStep, StepIdentifierUsingId, StepIdentifierUsingName} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
+import type {GithubWorkflowStep, StepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
 
 declare module '@kie/act-js' {
     type CustemStepIdentifier = {
@@ -9,9 +9,7 @@ declare module '@kie/act-js' {
         with?: string;
         envs?: string[];
         inputs?: string[];
-    };
+    } & Omit<StepIdentifier, 'name' | 'id' | 'run' | 'mockWith'>;
 
-    type StepIdentifier = ActStepIdentifier;
-
-    export type {StepIdentifierUsingId, StepIdentifierUsingName, GithubWorkflowStep, StepIdentifier, CustemStepIdentifier};
+    export type {GithubWorkflowStep, StepIdentifier, CustemStepIdentifier};
 }
diff --git a/workflow_tests/utils/JobMocker.ts b/workflow_tests/utils/JobMocker.ts
@@ -1,4 +1,4 @@
-import type {CustemStepIdentifier, StepIdentifier, StepIdentifierUsingName} from '@kie/act-js';
+import type {CustemStepIdentifier, StepIdentifier} from '@kie/act-js';
 import type {PathOrFileDescriptor} from 'fs';
 import fs from 'fs';
 import path from 'path';
@@ -51,12 +51,13 @@ class JobMocker {
                     delete job.with;
                 }
                 job.steps = mockJob.steps.map((step) => {
+                    const customStep = step as CustemStepIdentifier;
                     const mockStep: CustemStepIdentifier = {
-                        name: (step as StepIdentifierUsingName).name,
+                        name: customStep.name,
                         run: step.mockWith,
                     };
-                    if ((step as CustemStepIdentifier).id) {
-                        mockStep.id = (step as CustemStepIdentifier).id;
+                    if (customStep.id) {
+                        mockStep.id = customStep.id;
                     }
                     if (jobWith) {
                         mockStep.with = jobWith;

diff --git a/workflow_tests/utils/preGenerateTest.ts b/workflow_tests/utils/preGenerateTest.ts
@@ -218,7 +218,8 @@ const getMockFileContent = (workflowName: string, jobs: Record<string, YamlMockJ
         let mockStepsContent = `\n// ${jobId.toLowerCase()}`;
         const stepMocks: string[] = [];
         job.steps.forEach((step) => {
-            const stepMockName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__${(step as CustemStepIdentifier).name
+            const customStep = step as CustemStepIdentifier;
+            const stepMockName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__${customStep.name
                 .replaceAll(' ', '_')
                 .replaceAll('-', '_')
                 .replaceAll(',', '')
@@ -227,7 +228,7 @@ const getMockFileContent = (workflowName: string, jobs: Record<string, YamlMockJ
                 .replaceAll('.js', '')
                 .toUpperCase()}__STEP_MOCK`;
             stepMocks.push(stepMockName);
-            mockStepsContent += mockStepTemplate(stepMockName, step as CustemStepIdentifier, jobId);
+            mockStepsContent += mockStepTemplate(stepMockName, customStep, jobId);
         });
 
         const jobMocksName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__STEP_MOCKS`;
@@ -245,13 +246,8 @@ const getAssertionsFileContent = (jobs: Record<string, YamlMockJob>): string =>
     Object.entries(jobs).forEach(([jobId, job]) => {
         let stepAssertionsContent = '';
         job.steps.forEach((step: CustemStepIdentifier | StepIdentifier) => {
-            stepAssertionsContent += stepAssertionTemplate(
-                (step as CustemStepIdentifier).name,
-                jobId.toUpperCase(),
-                (step as CustemStepIdentifier).name,
-                (step as CustemStepIdentifier).inputs,
-                (step as CustemStepIdentifier).envs,
-            );
+            const customStep = step as CustemStepIdentifier;
+            stepAssertionsContent += stepAssertionTemplate(customStep.name, jobId.toUpperCase(), customStep.name, customStep.inputs, customStep.envs);
         });
         const jobAssertionName = `assert${jobId.charAt(0).toUpperCase() + jobId.slice(1)}JobExecuted`;
         jobAssertions.push(jobAssertionName);