Ensure workspace path ends with a slash

Tyrrrz · May 26, 2022 · ef58724 · ef58724
1 parent e57396d
commit ef58724
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/GitHubActionsTestLogger/GitHubWorkflow.cs b/GitHubActionsTestLogger/GitHubWorkflow.cs
@@ -91,7 +91,8 @@ public partial class GitHubWorkflow
         StringComparison.OrdinalIgnoreCase
     );
 
-    public static string? SummaryFilePath { get; } = Environment.GetEnvironmentVariable("GITHUB_STEP_SUMMARY");
+    public static string? SummaryFilePath { get; } =
+        Environment.GetEnvironmentVariable("GITHUB_STEP_SUMMARY");
 
     public static string? TryGenerateFilePermalink(string filePath, int? line)
     {
@@ -106,7 +107,11 @@ public partial class GitHubWorkflow
             string.IsNullOrWhiteSpace(commitHash))
             return null;
 
-        var filePathNormalized = PathEx.GetRelativePath(workspacePath, filePath).Replace("\\", "/").Trim('/');
+        var filePathNormalized = PathEx
+            .GetRelativePath(workspacePath.EnsureEndsWith("/"), filePath)
+            .Replace("\\", "/")
+            .Trim('/');
+
         var lineMarker = line?.Pipe(l => $"#L{l}");
 
         return $"{serverUrl}/{repositorySlug}/blob/{commitHash}/{filePathNormalized}{lineMarker}";

diff --git a/GitHubActionsTestLogger/Utils/Extensions/StringExtensions.cs b/GitHubActionsTestLogger/Utils/Extensions/StringExtensions.cs
@@ -39,4 +39,10 @@ public static StringBuilder Trim(this StringBuilder builder)
 
         return builder;
     }
+
+    public static string EnsureEndsWith(
+        this string str,
+        string end,
+        StringComparison comparison = StringComparison.Ordinal) =>
+        !str.EndsWith(end, comparison) ? str + end : str;
 }
diff --git a/GitHubActionsTestLogger/Utils/PathEx.cs b/GitHubActionsTestLogger/Utils/PathEx.cs
@@ -8,9 +8,8 @@ internal static class PathEx
     // members, so we'll just use this one on all targets.
     public static string GetRelativePath(string basePath, string path)
     {
-        // Without using System
-        var basePathUri = new Uri(basePath);
-        var pathUri = new Uri(path);
+        var basePathUri = new Uri(basePath, UriKind.Absolute);
+        var pathUri = new Uri(path, UriKind.Absolute);
 
         return Uri.UnescapeDataString(
             basePathUri