sanitize the paths for the Windows CI

amtoine · Nov 7, 2023 · 02861d6 · 02861d6
1 parent 0f3a397
commit 02861d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/nu-git-manager/fs/dir.nu b/src/nu-git-manager/fs/dir.nu
@@ -1,3 +1,5 @@
+use path.nu ["path sanitize"]
+
 # clean all empty directories recursively, starting from a list of empty leaves
 #
 # /!\ this command will return sanitized paths /!\

diff --git a/tests/gm.nu b/tests/gm.nu
@@ -246,17 +246,20 @@ export def store-cleaning-after-remove [] {
 export def store-cleaning [] {
     run-with-env --prepare-cache {
         gm clone https://github.com/amtoine/nu-git-manager --depth 1
-        rm --force --recursive --verbose (
-            $env.GIT_REPOS_HOME | path join "github.com/amtoine/nu-git-manager"
+
+        let repo = (
+            $env.GIT_REPOS_HOME | path join "github.com/amtoine/nu-git-manager" | path sanitize
         )
 
-        let expected = [($env.GIT_REPOS_HOME | path join "github.com/amtoine")]
+        rm --force --recursive --verbose $repo
+
+        let expected = [($repo | path dirname)]
         assert equal (gm clean --list) $expected
 
         let expected = [
-            ($env.GIT_REPOS_HOME | path join "github.com/amtoine")
-            ($env.GIT_REPOS_HOME | path join "github.com")
-            $env.GIT_REPOS_HOME
+            ($repo | path dirname)
+            ($repo | path dirname --num-levels 2)
+            ($repo | path dirname --num-levels 3)
         ]
         assert equal (gm clean) $expected
 

diff --git a/tests/mod.nu b/tests/mod.nu
@@ -257,7 +257,7 @@ export def store-cleaning [] {
 
         let actual = $empty_directories
             | each {|it|
-                let path = $env.GIT_REPOS_HOME | path join $it
+                let path = $env.GIT_REPOS_HOME | path join $it | path sanitize
                 mkdir $path
 
                 $path