Restrict the number of file names provided in use_r() and `use_test…

…()` (#862)

For for number of files in check_file_name(). Fixes #861.

NEWS.md

@@ -1,5 +1,7 @@
 # usethis (development version)
 
+* `use_r()` and `use_test()` would throw an error if multiple names are provided in their 'name' argument (#862, @strboul).
+
 * `edit_rstudio_snippets()` makes it more clear which snippet types are allowed and that user's snippets mask the built-in snippets (#885, @GegznaV).
 
 * `use_test()` should work again on Windows, when called with no argument, i.e. when the active `.R` file is determined from RStudio's source editor context (#901).

R/r.R

@@ -20,6 +20,9 @@ use_r <- function(name = NULL) {
 }
 
 check_file_name <- function(name) {
+  if (!is_string(name)) {
+    ui_stop("Name must be a single string")
+  }
   if (!valid_file_name(path_ext_remove(name))) {
     ui_stop(c(
       "{ui_value(name)} is not a valid file name. It should:",

R/test.R

@@ -44,14 +44,11 @@ use_test <- function(name = NULL, open = interactive()) {
     use_testthat()
   }
 
-  if (is.null(name)) {
-    name <- get_active_r_file(path = "R")
-  } else {
-    check_file_name(name)
-  }
-
+  name <- name %||% get_active_r_file(path = "R")
   name <- paste0("test-", name)
   name <- slug(name, "R")
+  check_file_name(name)
+
   path <- path("tests", "testthat", name)
 
   if (file_exists(proj_path(path))) {

tests/testthat/test-use-r.R

@@ -5,3 +5,7 @@ test_that("use_r() creates a .R file below R/", {
   use_r("foo")
   expect_proj_file("R/foo.R")
 })
+
+test_that("check_file_name() requires single vector", {
+  expect_usethis_error(check_file_name(c("a", "b")), "single string")
+})