Merge pull request #2 from ContinuIT-nl/bug/publish

Bug/publish
ContinuIT-nl · Dec 31, 2024 · 34d9a96 · 34d9a96
2 parents dc17b8b + 2aea7d6
commit 34d9a96
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 27 deletions.
diff --git a/src/testReportConfig.ts b/src/testReportConfig.ts
@@ -1,4 +1,4 @@
-import { z } from 'npm:zod';
+import { z } from 'zod';
 
 const defaultOKColor = '#2EBE4E';
 const defaultFailedColor = '#900';

diff --git a/src/testReportData.ts b/src/testReportData.ts
@@ -79,7 +79,7 @@ function createLcovSummary(lcov: LcovFile[]): LcovSummary {
 type Failure = {
   message: string;
   file: string;
-  type: 'junit' | 'lcov' | 'write';
+  type: 'junit' | 'lcov' | 'write' | 'coverage' | 'test';
 };
 
 export type GetTestReportDataResult = {

diff --git a/src/testReportToManifest.ts b/src/testReportToManifest.ts
@@ -22,10 +22,35 @@ const convertTestresultsToManifest = (data: GetTestReportDataResult) => {
   // todo: add test for following 2 lines
   const coverage_color = levels.find((level) => level.threshold <= coverage)?.color ?? '#555';
 
-  const minimal = config.limits?.coverage_percentage_minimal ?? 0;
-  const coverage_status = coverage >= minimal ? 'ok' : 'failed';
+  const limits = config.limits ?? {
+    test_percentage_failed: 0,
+    test_percentage_disabled: 0,
+    coverage_percentage_minimal: 0,
+  };
+
+  if (coverage < limits.coverage_percentage_minimal) {
+    failures.push({
+      type: 'coverage',
+      message: `Coverage is below the minimal threshold of ${limits.coverage_percentage_minimal}%`,
+      file: '',
+    });
+  }
+
+  if (test_failed > limits.test_percentage_failed * 0.01 * test_total) {
+    failures.push({
+      type: 'junit',
+      message: `Test failed is above the limit of ${limits.test_percentage_failed}%`,
+      file: '',
+    });
+  }
 
-  // todo: process limits and add to failures
+  if (test_skipped > limits.test_percentage_disabled * 0.01 * test_total) {
+    failures.push({
+      type: 'test',
+      message: `Test skipped is above the limit of ${limits.test_percentage_disabled}%`,
+      file: '',
+    });
+  }
 
   return {
     // Source
@@ -54,7 +79,6 @@ const convertTestresultsToManifest = (data: GetTestReportDataResult) => {
     coverage_branches_hit: lcovSummary.branchesHit,
     coverage_branches_percentage: percentageNoZero(lcovSummary.branchesHit, lcovSummary.branchesFound),
     coverage_percentage,
-    coverage_status,
     coverage_color,
     // Code coverage details
     coverage_details: lcovDatas.map((file) => ({

diff --git a/test_data/deno_success/testreport.json b/test_data/deno_success/testreport.json
@@ -3,9 +3,6 @@
     "junit": ["test_data/deno_success/junit.xml"],
     "coverage": ["test_data/deno_success/cov.lcov"]
   },
-  "limits": {
-    "coverage_percentage_minimal": 80
-  },
   "manifest": {
     "output": "test_output/deno_success/results.json"
   },

diff --git a/test_results/coverage_badge.svg b/test_results/coverage_badge.svg
diff --git a/test_results/test_results.json b/test_results/test_results.json
@@ -135,14 +135,13 @@
       "state": "PASSED"
     }
   ],
-  "coverage_lines_total": 792,
-  "coverage_lines_hit": 791,
-  "coverage_lines_percentage": "99.9%",
-  "coverage_branches_total": 128,
-  "coverage_branches_hit": 127,
-  "coverage_branches_percentage": "99.2%",
-  "coverage_percentage": "99.2%",
-  "coverage_status": "ok",
+  "coverage_lines_total": 815,
+  "coverage_lines_hit": 815,
+  "coverage_lines_percentage": "100.0%",
+  "coverage_branches_total": 129,
+  "coverage_branches_hit": 129,
+  "coverage_branches_percentage": "100.0%",
+  "coverage_percentage": "100.0%",
   "coverage_color": "#2EBE4E",
   "coverage_details": [
     {
@@ -201,12 +200,12 @@
     },
     {
       "name": "testReportToManifest.ts",
-      "lines_total": 59,
-      "lines_hit": 58,
-      "lines_percentage": "98.3%",
-      "branches_total": 22,
-      "branches_hit": 21,
-      "branches_percentage": "95.5%"
+      "lines_total": 82,
+      "lines_hit": 82,
+      "lines_percentage": "100.0%",
+      "branches_total": 23,
+      "branches_hit": 23,
+      "branches_percentage": "100.0%"
     },
     {
       "name": "testReportToMarkdown.ts",

diff --git a/test_results/test_results.md b/test_results/test_results.md
@@ -1,7 +1,7 @@
 # Test Results
 
 ![tests](data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHJvbGU9ImltZyIgd2lkdGg9IjEyMS45IiBoZWlnaHQ9IjIwIiB2aWV3Qm94PSIwIDAgMTIxOSAyMDAiIGFyaWEtbGFiZWw9InRlc3RzIDI1LzI1IHBhc3NlZCI+PHRpdGxlPnRlc3RzIDI1LzI1IHBhc3NlZDwvdGl0bGU+PGc+PGNsaXBQYXRoIGlkPSJyIj48cmVjdCB3aWR0aD0iMTIxOSIgaGVpZ2h0PSIyMDAiIHJ4PSIzMCIgZmlsbD0iI2ZmZiIvPjwvY2xpcFBhdGg+PC9nPjxnIGNsaXAtcGF0aD0idXJsKCNyKSI+PHJlY3QgZmlsbD0iIzU1NSIgd2lkdGg9IjM2NiIgaGVpZ2h0PSIyMDAiLz48cmVjdCBmaWxsPSIjMkVCRTRFIiB4PSIzNjYiIHdpZHRoPSI4NTMiIGhlaWdodD0iMjAwIi8+PC9nPjxnIGFyaWEtaGlkZGVuPSJ0cnVlIiBmaWxsPSIjZmZmIiBmb250LWZhbWlseT0iVmVyZGFuYSxEZWphVnUgU2FucyxzYW5zLXNlcmlmIiBmb250LXNpemU9IjExMCI+PHRleHQgeD0iNjAiIHk9IjE0OCIgdGV4dExlbmd0aD0iMjY2IiBmaWxsPSIjMDAwIiBvcGFjaXR5PSIwLjEiPnRlc3RzPC90ZXh0Pjx0ZXh0IHg9IjUwIiB5PSIxMzgiIHRleHRMZW5ndGg9IjI2NiI+dGVzdHM8L3RleHQ+PHRleHQgeD0iNDIxIiB5PSIxNDgiIHRleHRMZW5ndGg9Ijc1MyIgZmlsbD0iIzAwMCIgb3BhY2l0eT0iMC4xIj4yNS8yNSBwYXNzZWQ8L3RleHQ+PHRleHQgeD0iNDExIiB5PSIxMzgiIHRleHRMZW5ndGg9Ijc1MyI+MjUvMjUgcGFzc2VkPC90ZXh0PjwvZz48L3N2Zz4=)
-![coverage](data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHJvbGU9ImltZyIgd2lkdGg9IjEwNy4zIiBoZWlnaHQ9IjIwIiB2aWV3Qm94PSIwIDAgMTA3MyAyMDAiIGFyaWEtbGFiZWw9ImNvdmVyYWdlIDk5LjIlIj48dGl0bGU+Y292ZXJhZ2UgOTkuMiU8L3RpdGxlPjxnPjxjbGlwUGF0aCBpZD0iciI+PHJlY3Qgd2lkdGg9IjEwNzMiIGhlaWdodD0iMjAwIiByeD0iMzAiIGZpbGw9IiNmZmYiLz48L2NsaXBQYXRoPjwvZz48ZyBjbGlwLXBhdGg9InVybCgjcikiPjxyZWN0IGZpbGw9IiM1NTUiIHdpZHRoPSI2MDMiIGhlaWdodD0iMjAwIi8+PHJlY3QgZmlsbD0iIzJFQkU0RSIgeD0iNjAzIiB3aWR0aD0iNDcwIiBoZWlnaHQ9IjIwMCIvPjwvZz48ZyBhcmlhLWhpZGRlbj0idHJ1ZSIgZmlsbD0iI2ZmZiIgZm9udC1mYW1pbHk9IlZlcmRhbmEsRGVqYVZ1IFNhbnMsc2Fucy1zZXJpZiIgZm9udC1zaXplPSIxMTAiPjx0ZXh0IHg9IjYwIiB5PSIxNDgiIHRleHRMZW5ndGg9IjUwMyIgZmlsbD0iIzAwMCIgb3BhY2l0eT0iMC4xIj5jb3ZlcmFnZTwvdGV4dD48dGV4dCB4PSI1MCIgeT0iMTM4IiB0ZXh0TGVuZ3RoPSI1MDMiPmNvdmVyYWdlPC90ZXh0Pjx0ZXh0IHg9IjY1OCIgeT0iMTQ4IiB0ZXh0TGVuZ3RoPSIzNzAiIGZpbGw9IiMwMDAiIG9wYWNpdHk9IjAuMSI+OTkuMiU8L3RleHQ+PHRleHQgeD0iNjQ4IiB5PSIxMzgiIHRleHRMZW5ndGg9IjM3MCI+OTkuMiU8L3RleHQ+PC9nPjwvc3ZnPg==)
+![coverage](data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHJvbGU9ImltZyIgd2lkdGg9IjExNC4zIiBoZWlnaHQ9IjIwIiB2aWV3Qm94PSIwIDAgMTE0MyAyMDAiIGFyaWEtbGFiZWw9ImNvdmVyYWdlIDEwMC4wJSI+PHRpdGxlPmNvdmVyYWdlIDEwMC4wJTwvdGl0bGU+PGc+PGNsaXBQYXRoIGlkPSJyIj48cmVjdCB3aWR0aD0iMTE0MyIgaGVpZ2h0PSIyMDAiIHJ4PSIzMCIgZmlsbD0iI2ZmZiIvPjwvY2xpcFBhdGg+PC9nPjxnIGNsaXAtcGF0aD0idXJsKCNyKSI+PHJlY3QgZmlsbD0iIzU1NSIgd2lkdGg9IjYwMyIgaGVpZ2h0PSIyMDAiLz48cmVjdCBmaWxsPSIjMkVCRTRFIiB4PSI2MDMiIHdpZHRoPSI1NDAiIGhlaWdodD0iMjAwIi8+PC9nPjxnIGFyaWEtaGlkZGVuPSJ0cnVlIiBmaWxsPSIjZmZmIiBmb250LWZhbWlseT0iVmVyZGFuYSxEZWphVnUgU2FucyxzYW5zLXNlcmlmIiBmb250LXNpemU9IjExMCI+PHRleHQgeD0iNjAiIHk9IjE0OCIgdGV4dExlbmd0aD0iNTAzIiBmaWxsPSIjMDAwIiBvcGFjaXR5PSIwLjEiPmNvdmVyYWdlPC90ZXh0Pjx0ZXh0IHg9IjUwIiB5PSIxMzgiIHRleHRMZW5ndGg9IjUwMyI+Y292ZXJhZ2U8L3RleHQ+PHRleHQgeD0iNjU4IiB5PSIxNDgiIHRleHRMZW5ndGg9IjQ0MCIgZmlsbD0iIzAwMCIgb3BhY2l0eT0iMC4xIj4xMDAuMCU8L3RleHQ+PHRleHQgeD0iNjQ4IiB5PSIxMzgiIHRleHRMZW5ndGg9IjQ0MCI+MTAwLjAlPC90ZXh0PjwvZz48L3N2Zz4=)
 
 Results from `./testreport.json` contains 5 testsuites with 25 tests:
 
@@ -18,7 +18,7 @@ Results from `./testreport.json` contains 5 testsuites with 25 tests:
 
 | ☰ Lines | ᛘ Branches |
 | ------: | ---------: |
-|   99.9% |      99.2% |
+|  100.0% |     100.0% |
 
 <details>
 <summary>Detailed Test Results</summary>
@@ -64,7 +64,7 @@ Results from `./testreport.json` contains 5 testsuites with 25 tests:
 | `testReportConfig.ts`     |  100.0% |        N/A |
 | `testReportData.ts`       |  100.0% |     100.0% |
 | `testReportToBadges.ts`   |  100.0% |        N/A |
-| `testReportToManifest.ts` |   98.3% |      95.5% |
+| `testReportToManifest.ts` |  100.0% |     100.0% |
 | `testReportToMarkdown.ts` |  100.0% |     100.0% |
 | `createBadgeSvg.ts`       |  100.0% |     100.0% |
 | `junit_parser.ts`         |  100.0% |        N/A |