Expansion of '~' in Windows now follows the definition of fs::path_ex…

…pand() rather than base::path.expand().

NEWS.md

@@ -53,6 +53,8 @@
 
  * `path_rel2abs()` will not expand symlinks to avoid problems with Python's venv.
                                                     (fix #64, reported by @DE0CH)
+
+ * Expansion of `'~'` in Windows now follows the definition of `fs::path_expand()` rather than `base::path.expand()`.
 
 
 ## New features and improvements

R/path_rel2abs.R

@@ -1,6 +1,9 @@
-#' Converts a relative path to an absolute path. It tries really hard to create
-#' canonical paths. If the path passed corresponds to an executable, it tries
-#' to find its path using `Sys.which()`.
+#' Converts a relative path to an absolute path.
+#'
+#' It tries really hard to create canonical paths. If the path passed
+#' corresponds to an executable, it tries to find its path using `Sys.which()`.
+#' Expansion of `'~'` in Windows follows the definition of `fs::path_expand()`
+#' rather than `base::path.expand()`.
 #' 
 #' @param path (`character(1)`) Character string representing a relative path.
 #' @param cwd (`character(1)`) Current working directory.

tests/testthat/test-path.R

@@ -9,12 +9,12 @@ test_path_rel2abs <- function(testcases)
     if (testcases[i,3L] == "Sys.which") {
       exp <- path_abs(Sys.which(testcases[i,1]))
     } else {
-      exp <- gsub("\\", "/", path.expand(testcases[i,3L]), fixed = TRUE)
+      exp <- gsub("\\", "/", path_expand(testcases[i,3L]), fixed = TRUE)
     }
     if (res == exp) {
       #cat("[OK] ", i, ": path_rel2abs(\"", orig, "\", \"", cwd, "\") -> ", res, "\n", sep="")
     } else {
-      cat("[FAILED] ", i, ": path_rel2abs(\"", orig, "\", \"", cwd, "\") -> ", res, " but expected: ", exp, "\n")
+      cat(sep="", "[FAILED] ", i, ": path_rel2abs(\"", orig, "\", \"", cwd, "\") -> ", res, " but expected: ", exp, "\n")
     }
     expect_match(res, exp, fixed = TRUE)
   }