Merge pull request #100 from technote-space/feature/#99

Feature/#99
technote-space · Jun 2, 2022 · 7577586 · 7577586
2 parents b2b9930 + c878e31
commit 7577586
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/src/fixtures/actions.list.jobs2.json b/src/fixtures/actions.list.jobs2.json
@@ -10,7 +10,7 @@
       "url": "https://api.github.com/repos/octo-org/octo-repo/actions/jobs/399444496",
       "html_url": "https://github.com/octo-org/octo-repo/runs/399444496",
       "status": "completed",
-      "conclusion": "failure",
+      "conclusion": null,
       "started_at": "2020-01-20T17:42:40Z",
       "completed_at": "2020-01-20T17:44:39Z",
       "name": "build",

diff --git a/src/process.test.ts b/src/process.test.ts
@@ -59,23 +59,26 @@ describe('getJobs', () => {
 describe('getJobConclusions', () => {
   it('should get conclusions', () => {
     expect(getJobConclusions([
-      { name: 'test1', conclusion: 'cancelled' },
-      { name: 'test2', conclusion: 'neutral' },
-      { name: 'test3', conclusion: 'failure' },
-      { name: 'test4', conclusion: 'success' },
-      { name: 'test5', conclusion: 'failure' },
-      { name: 'test6', conclusion: 'success' },
-      { name: 'test7', conclusion: 'cancelled' },
-      { name: 'test8', conclusion: 'skipped' },
-      { name: 'test9', conclusion: 'test1' },
-      { name: 'test9', conclusion: 'test2' },
-      { name: 'test9', conclusion: 'test3' },
+      { conclusion: 'cancelled' },
+      { conclusion: null },
+      { conclusion: 'neutral' },
+      { conclusion: 'failure' },
+      { conclusion: 'success' },
+      { conclusion: 'failure' },
+      { conclusion: 'success' },
+      { conclusion: 'cancelled' },
+      { conclusion: 'skipped' },
+      { conclusion: 'test1' },
+      { conclusion: 'test2' },
+      { conclusion: 'test3' },
     ])).toEqual([
       'cancelled',
       'neutral',
       'failure',
       'success',
       'skipped',
+      'test1',
+      'test2',
       'test3',
     ]);
   });
@@ -121,7 +124,7 @@ describe('execute', () => {
     stdoutContains(mockStdout, [
       '::group::Jobs:',
       '::group::Conclusions:',
-      getLogStdout(['success']),
+      getLogStdout(['skipped', 'success']),
       '::group::Conclusion:',
       '"success"',
       '::set-output name=conclusion::success',
@@ -144,7 +147,7 @@ describe('execute', () => {
     stdoutContains(mockStdout, [
       '::group::Jobs:',
       '::group::Conclusions:',
-      getLogStdout(['success', 'cancelled', 'skipped']),
+      getLogStdout(['cancelled', 'success', 'skipped']),
       '::group::Conclusion:',
       '"cancelled"',
       '::set-output name=conclusion::cancelled',
@@ -213,7 +216,7 @@ describe('execute', () => {
     stdoutContains(mockStdout, [
       '::group::Jobs:',
       '::group::Conclusions:',
-      getLogStdout(['success']),
+      getLogStdout(['skipped', 'success']),
       '::group::Conclusion:',
       '"success"',
       '::set-output name=conclusion::success',

diff --git a/src/process.ts b/src/process.ts
@@ -18,13 +18,10 @@ export const getJobs = async(octokit: Octokit, context: Context): Promise<Array<
   },
 );
 
-export const getJobConclusions = (jobs: Array<{ name: string; conclusion: string | null }>): Array<string> => Utils.uniqueArray(
-  Object.values(
-    jobs
-      .filter(job => null !== job.conclusion)
-      .map(job => ({ name: job.name, conclusion: String(job.conclusion) }))
-      .reduce((acc, job) => ({ ...acc, [job.name]: job.conclusion }), {}),
-  ),
+export const getJobConclusions = (jobs: Array<{ conclusion: string | null }>): Array<string> => Utils.uniqueArray(
+  jobs
+    .filter((job): job is { conclusion: string } => null !== job.conclusion)
+    .map(job => job.conclusion),
 );
 
 // eslint-disable-next-line no-magic-numbers