diff --git a/man/solve_file_name_conflict.Rd b/man/solve_file_name_conflict.Rd index caf722e..1ee85bc 100644 --- a/man/solve_file_name_conflict.Rd +++ b/man/solve_file_name_conflict.Rd @@ -10,7 +10,8 @@ solve_file_name_conflict( dir = ".", extra_msg = NULL, quiet = FALSE, - what = NULL + what = NULL, + new_file = NULL ) } \arguments{ @@ -25,6 +26,8 @@ solve_file_name_conflict( \item{quiet}{A logical, informs where the occurrences are found. (Default, \code{FALSE})} \item{what}{Which file conflicts we talking about} + +\item{new_file}{(Optional) new file name} } \value{ Mostly called for its side-effects, but will return the number of matches diff --git a/tests/testthat/test-rename.R b/tests/testthat/test-rename.R index 78826d1..3f1879a 100644 --- a/tests/testthat/test-rename.R +++ b/tests/testthat/test-rename.R @@ -126,8 +126,7 @@ test_that("force and action are deprecated", { file <- withr::local_tempfile(fileext = ".R", lines = "# x1") file2 <- withr::local_tempfile(fileext = ".R") unlink(file2) - lifecycle::expect_deprecated( + lifecycle::expect_defunct( rename_files2(file, file2, force = TRUE) - ) |> - expect_message("Renamed .+ by force") + ) })