Merge pull request #1253 from mikepenz/fix/1251

Always limit file resolution by workspace root
mikepenz · Nov 28, 2024 · 9ffe999 · 9ffe999
2 parents a427a90 + 80a45f1
commit 9ffe999
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 39 deletions.
diff --git a/__tests__/table.test.ts b/__tests__/table.test.ts
@@ -59,6 +59,7 @@ describe('buildSummaryTables', () => {
       '*',
       true,
       true,
+      true,
       [],
       '{{SUITE_NAME}}/{{TEST_NAME}}',
       '/'
@@ -108,6 +109,7 @@ describe('buildSummaryTables', () => {
       '*',
       true,
       true,
+      true,
       [],
       '{{SUITE_NAME}}/{{TEST_NAME}}',
       '/'

diff --git a/__tests__/testParser.test.ts b/__tests__/testParser.test.ts
@@ -124,17 +124,17 @@ note: run with &#x60;RUST_BACKTRACE&#x3D;1&#x60; environment variable to display
 
 describe('resolvePath', () => {
   it('should find correct file for Java fileName', async () => {
-    const path = await resolvePath('EmailAddressTest', ['/build/', '/__pycache__/'])
+    const path = await resolvePath('', 'EmailAddressTest', ['/build/', '/__pycache__/'])
     expect(path).toBe('test_results/tests/email/src/test/java/action/surefire/report/email/EmailAddressTest.java')
   })
 
   it('should find correct file for Kotlin fileName', async () => {
-    const path = await resolvePath('CalcUtilsTest', ['/build/', '/__pycache__/'])
+    const path = await resolvePath('', 'CalcUtilsTest', ['/build/', '/__pycache__/'])
     expect(path).toBe('test_results/tests/utils/src/test/java/action/surefire/report/calc/CalcUtilsTest.kt')
   })
 
   it('should find correct file with a relative path', async () => {
-    const path = await resolvePath('./test_results/CalcUtilsTest.kt', ['/build/', '/__pycache__/'])
+    const path = await resolvePath('', './test_results/CalcUtilsTest.kt', ['/build/', '/__pycache__/'])
     expect(path).toBe('test_results/CalcUtilsTest.kt')
   })
 })
@@ -191,6 +191,7 @@ describe('parseFile', () => {
       undefined,
       undefined,
       undefined,
+      undefined,
       '/',
       undefined,
       undefined,
@@ -268,6 +269,7 @@ describe('parseFile', () => {
       '',
       false,
       false,
+      false,
       ['/build/', '/__pycache__/'],
       '{{BREAD_CRUMB}}{{SUITE_NAME}}/{{TEST_NAME}}',
       '/',
@@ -434,6 +436,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       '',
       false,
       false,
+      false,
       undefined,
       '{{BREAD_CRUMB}}{{SUITE_NAME}}/{{TEST_NAME}}'
     )
@@ -504,6 +507,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/issues/testDisabled.xml',
       '',
       true,
+      true,
       false,
       undefined,
       '{{SUITE_NAME}}/{{TEST_NAME}}'
@@ -813,6 +817,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/mocha/mocha.xml',
       '*',
       true,
+      true,
       false,
       undefined,
       '{{SUITE_NAME}}/{{TEST_NAME}}'
@@ -844,6 +849,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/mocha/mocha.xml',
       '*',
       true,
+      true,
       false,
       ['/build/', '/__pycache__/'],
       '{{TEST_NAME}}'
@@ -875,6 +881,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/mocha/mocha.xml',
       '*',
       true,
+      true,
       false,
       ['/build/', '/__pycache__/'],
       '{{TEST_NAME}}',
@@ -984,6 +991,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/junit-web-test/expectedRetries.xml',
       '',
       false,
+      false,
       true,
       ['/build/', '/__pycache__/']
     )
@@ -1060,7 +1068,8 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/junit-web-test/expectedRetries.xml',
       '',
       true,
-      true
+      true,
+      true,
     )
     expect(testResult).toBeDefined()
     const {totalCount, skippedCount, globalAnnotations} = testResult!!
@@ -1132,6 +1141,7 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
       'test_results/perl/result.xml',
       '',
       true,
+      true,
       undefined,
       undefined,
       undefined,
@@ -1254,6 +1264,7 @@ describe('parseTestReports', () => {
       '*',
       true,
       true,
+      true,
       [],
       '{{SUITE_NAME}}/{{TEST_NAME}}',
       '/'
@@ -1290,6 +1301,7 @@ describe('parseTestReports', () => {
       '',
       false,
       false,
+      false,
       [],
       '',
       '/',

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -80,6 +80,7 @@ export async function run(): Promise<void> {
         retrieve('reportPaths', reportPaths, i, reportsCount),
         retrieve('suiteRegex', suiteRegex, i, reportsCount),
         includePassed,
+        annotateNotice,
         checkRetries,
         excludeSources,
         retrieve('checkTitleTemplate', checkTitleTemplate, i, reportsCount),