Use cli_abort() for all errors

R/shim.R

@@ -178,10 +178,10 @@ package_name <- function(package, character.only = FALSE) {
   }
 
   if (!is.character(package) || length(package) != 1L) {
-    abort("`package` must be character vector of length 1.")
+    cli::cli_abort("{.arg package} must be character vector of length 1.")
   }
   if (is.na(package) || (package == "")) {
-    abort("`package` must not be NA or ''.")
+    cli::cli_abort("{.arg package} must not be NA or ''.")
   }
 
   package

tests/testthat/_snaps/shim.md

@@ -0,0 +1,23 @@
+# package_name throws errors with invalid names
+
+    Code
+      package_name_(c("x", "y"))
+    Condition
+      Error in `package_name()`:
+      ! `package` must be character vector of length 1.
+    Code
+      package_name_(1:10)
+    Condition
+      Error in `package_name()`:
+      ! `package` must be character vector of length 1.
+    Code
+      package_name_(NA_character_)
+    Condition
+      Error in `package_name()`:
+      ! `package` must not be NA or ''.
+    Code
+      package_name_("")
+    Condition
+      Error in `package_name()`:
+      ! `package` must not be NA or ''.
+

tests/testthat/test-shim.R

@@ -62,15 +62,14 @@ test_that("package_name mimics library", {
 })
 
 test_that("package_name throws errors with invalid names" ,{
-  x <- c("x", "y")
-  expect_error(package_name(quo(x), TRUE), "character vector")
-
-  x <- 1:10
-  expect_error(package_name(quo(x), TRUE), "character vector")
-
-  x <- NA_character_
-  expect_error(package_name(quo(x), TRUE), "NA")
-
-  x <- ""
-  expect_error(package_name(quo(x), TRUE), "''")
+  package_name_ <- function(x) {
+    package_name(quo(x), character.only = TRUE)
+  }
+
+  expect_snapshot(error = TRUE, {
+    package_name_(c("x", "y"))
+    package_name_(1:10)
+    package_name_(NA_character_)
+    package_name_("")
+  })
 })