Skip to content

Commit 59be020

Browse files
Merge pull request #31 from Mikael-RnD/trailing-slash-fix
fix: standardize trailing slash in url
2 parents 7676a91 + 1b4a2e4 commit 59be020

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

action.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ runs:
143143
echo "testResultsFolder=$testResultsFolder" >> $GITHUB_OUTPUT
144144
mkdir -p "$testResultsFolder"
145145
testResults=""
146-
testExecutionBaseURL="${{ inputs.orchestratorUrl }}${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/orchestrator_/test/executions/"
146+
orchestratorURL="${{ inputs.orchestratorUrl }}"
147+
orchestratorURL="${orchestratorURL%/}"
148+
testExecutionBaseURL="${orchestratorURL}/${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/orchestrator_/test/executions/"
147149
testExecutionURLs=""
148150
repositoryContainsTests=0
149151
@@ -225,15 +227,17 @@ runs:
225227
testResults="${{ steps.run_tests.outputs.testResults }}"
226228
testExecutionUrls=""
227229
testResultsFolder="${{ steps.run_tests.outputs.testResultsFolder }}"
228-
testExecutionBaseURL="${{ inputs.orchestratorUrl }}${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/orchestrator_/test/executions/"
230+
orchestratorURL="${{ inputs.orchestratorUrl }}"
231+
orchestratorURL="${orchestratorURL%/}"
232+
baseUrl="${orchestratorURL}/${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/orchestrator_/test/executions/"
229233
folderId="${{ steps.get_folder_id.outputs.folderId }}"
230234
231235
# Loop through all JSON files in the test results folder
232236
while IFS= read -r testResultFilePath; do
233237
echo "Processing test result file: $testResultFilePath"
234238
testResultData=$(cat "$testResultFilePath" | jq '.')
235239
testCaseExecutions=$(echo "$testResultData" | jq -c '.TestSetExecutions[] | .TestCaseExecutions')
236-
testSetExecutionLink="$testExecutionBaseURL$(echo "$testResultData" | jq -r '.TestSetExecutions[0].Id')?fid=$folderId"
240+
testSetExecutionLink="${baseUrl}$(echo "$testResultData" | jq -r '.TestSetExecutions[0].Id')?fid=$folderId"
237241
238242
echo "Test execution can be viewed in Orchestrator by clicking this link: $testSetExecutionLink"
239243
@@ -269,7 +273,10 @@ runs:
269273
testResults="${{ steps.run_tests.outputs.testResults }}"
270274
testExecutionUrls=""
271275
testResultsFolder="${{ steps.run_tests.outputs.testResultsFolder }}"
272-
folderId="${{ steps.get_folder_id.outputs.folderId }}"
276+
folderId="${{ steps.get_folder_id.outputs.folderId }}"
277+
orchestratorURL="${{ inputs.orchestratorUrl }}"
278+
orchestratorURL="${orchestratorURL%/}"
279+
baseUrl="${orchestratorURL}/${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/testmanager_/"
273280
274281
# Loop through all JSON files in the test results folder
275282
while IFS= read -r testResultFilePath; do
@@ -280,7 +287,7 @@ runs:
280287
while IFS= read -r testSetRun; do
281288
testSetRunId=$(echo "$testSetRun" | jq -r '.Id')
282289
testSetRunName=$(echo "$testSetRun" | jq -r '.Name')
283-
testSetExecutionLink="${{ inputs.orchestratorUrl }}${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/testmanager_/${{ inputs.projectKey }}/testexecutions/$testSetRunId"
290+
testSetExecutionLink="${baseUrl}${{ inputs.projectKey }}/testexecutions/$testSetRunId"
284291
285292
echo "Test execution can be viewed in Test Manager by clicking this link: $testSetExecutionLink"
286293
@@ -290,7 +297,7 @@ runs:
290297
testName=$(echo "$testCase" | jq -r '.Name')
291298
testCaseId=$(echo "$testCase" | jq -r '.TestCaseId')
292299
testStatus=$(echo "$testCase" | jq -r '.Status')
293-
testCaseLink="${{ inputs.orchestratorUrl }}${{ inputs.orchestratorLogicalName }}/${{ inputs.orchestratorTenant }}/testmanager_/${{ inputs.projectKey }}/testexecution-results/$testSetRunId/$testCaseId"
300+
testCaseLink="${baseUrl}${{ inputs.projectKey }}/testexecution-results/$testSetRunId/$testCaseId"
294301
testResultsTable+=$'\n'"| [$testName]($testCaseLink) | $(if [ "$testStatus" == "Passed" ]; then echo "✅ Passed"; else echo "❌ Failed"; fi) |"
295302
done <<< $(echo "$testSetRun" | jq -c '.TestCaseExecutions[]')
296303

0 commit comments

Comments
 (0)