fix: make use_testthat() work for brand-new package (#1843)

* fix: make use_testthat() work for brand-new package

* check value is character in proj_desc_field_update()

* Also allow vectors > length 1 since desc() allows it
* union old and new when appending to avoid duplicates

---------

Co-authored-by: Andy Teucher <[email protected]>

Author: maelle

R/proj-desc.R

@@ -31,13 +31,13 @@ proj_desc_create <- function(name, fields = list(), roxygen = TRUE) {
 # including appending".
 proj_desc_field_update <- function(key, value, overwrite = TRUE, append = FALSE) {
   check_string(key)
-  stopifnot(is.character(value) || is.numeric(value), length(value) == 1)
+  check_character(value)
   check_bool(overwrite)
 
   desc <- proj_desc()
 
   old <- desc$get_list(key, default = "")
-  if (value %in% old) {
+  if (all(value %in% old)) {
     return(invisible())
   }
 
@@ -51,7 +51,7 @@ proj_desc_field_update <- function(key, value, overwrite = TRUE, append = FALSE)
   ui_done("Adding {ui_value(value)} to {ui_field(key)}")
 
   if (append) {
-    value <- c(old, value)
+    value <- union(old, value)
   }
 
   # https://github.com/r-lib/desc/issues/117

R/test.R

@@ -37,7 +37,7 @@ use_testthat_impl <- function(edition = NULL, parallel = FALSE) {
     edition <- check_edition(edition)
 
     use_dependency("testthat", "Suggests", paste0(edition, ".0.0"))
-    proj_desc_field_update("Config/testthat/edition", edition, overwrite = TRUE)
+    proj_desc_field_update("Config/testthat/edition", as.character(edition), overwrite = TRUE)
 
     if (parallel) {
       proj_desc_field_update("Config/testthat/parallel", "true", overwrite = TRUE)

tests/testthat/_snaps/proj-desc.md

@@ -1,4 +1,4 @@
-# proj_desc_field_append() only messages when adding
+# proj_desc_field_update() only messages when adding
 
     Code
       proj_desc_field_update("Config/Needs/foofy", "alfa", append = TRUE)
@@ -10,3 +10,10 @@
     Message
       v Adding 'bravo' to Config/Needs/foofy
 
+# proj_desc_field_update() works with multiple values
+
+    Code
+      proj_desc_field_update("Config/Needs/foofy", c("alfa", "bravo"), append = TRUE)
+    Message
+      v Adding 'alfa', 'bravo' to Config/Needs/foofy
+

tests/testthat/test-proj-desc.R

@@ -1,4 +1,4 @@
-test_that("proj_desc_field_append() only messages when adding", {
+test_that("proj_desc_field_update() only messages when adding", {
   create_local_package()
   withr::local_options(list(usethis.quiet = FALSE, crayon.enabled = FALSE))
 
@@ -9,3 +9,15 @@ test_that("proj_desc_field_append() only messages when adding", {
   })
   expect_equal(proj_desc()$get_list("Config/Needs/foofy"), c("alfa", "bravo"))
 })
+
+test_that("proj_desc_field_update() works with multiple values", {
+  create_local_package()
+  withr::local_options(list(usethis.quiet = FALSE, crayon.enabled = FALSE))
+
+  proj_desc_field_update("Config/Needs/foofy", "alfa", append = TRUE)
+  expect_snapshot({
+    proj_desc_field_update("Config/Needs/foofy", c("alfa", "bravo"),
+                           append = TRUE)
+  })
+  expect_equal(proj_desc()$get_list("Config/Needs/foofy"), c("alfa", "bravo"))
+})