apply more involved suggestions and update snaps

R/augment.R

@@ -86,7 +86,12 @@ augment.model_fit <- function(x, new_data, eval_time = NULL, ...) {
       "regression"          = augment_regression(x, new_data),
       "classification"      = augment_classification(x, new_data),
       "censored regression" = augment_censored(x, new_data, eval_time = eval_time),
-      cli::cli_abort("Unknown mode: {x$spec$mode}.")
+      cli::cli_abort(
+        c(
+          "Unknown mode {.val {x$spec$mode}}.",
+          "i" = "Model mode should be one of {.or {.val {all_modes}}}."
+        )
+      )
     )
   tibble::new_tibble(res)
 }

R/convert_data.R

@@ -350,7 +350,10 @@ check_dup_names <- function(x, y, call = rlang::caller_env()) {
   common_names <- intersect(colnames(x), colnames(y))
   if (length(common_names) > 0) {
     cli::cli_abort(
-      "{.arg x} and {.arg y} have the name{?s} {.val {common_names}} in common.",
+      c(
+        "{.arg x} and {.arg y} have the name{?s} {.val {common_names}} in common.",
+        "i" = "Please ensure that {.arg x} and {.arg y} don't share any column names."
+      ),
       call = call
     )
   }

R/predict.R

@@ -207,7 +207,7 @@ check_pred_type <- function(object, type, ..., call = rlang::caller_env()) {
   }
   if (!(type %in% pred_types))
     cli::cli_abort(
-      "{.arg type} should be one of:{.arg {pred_types}}",
+      "{.arg type} should be one of {.or {.arg {pred_types}}}.",
       call = call
     )
 

tests/testthat/_snaps/augment.md

@@ -0,0 +1,9 @@
+# regression models
+
+    Code
+      augment(reg_form, head(mtcars[, -1]))
+    Condition
+      Error in `augment()`:
+      ! Unknown mode "depeche".
+      i Model mode should be one of "classification", "regression", or "censored regression".
+

tests/testthat/_snaps/rand_forest_ranger.md

@@ -27,7 +27,7 @@
     Condition
       Warning:
       ! 1000 columns were requested but there were 6 predictors in the data.
-      i 6 will be used.
+      i 6 predictors will be used.
       Warning:
       ! 1000 samples were requested but there were 333 rows in the data.
       i 333 will be used.
@@ -39,7 +39,7 @@
     Condition
       Warning:
       ! 1000 columns were requested but there were 6 predictors in the data.
-      i 6 will be used.
+      i 6 predictors will be used.
       Warning:
       ! 1000 samples were requested but there were 333 rows in the data.
       i 333 will be used.

tests/testthat/test-augment.R

@@ -38,7 +38,10 @@ test_that('regression models', {
 
   reg_form$spec$mode <- "depeche"
 
-  expect_error(augment(reg_form, head(mtcars[, -1])), "Unknown mode: depeche")
+  expect_snapshot(
+    error = TRUE,
+    augment(reg_form, head(mtcars[, -1]))
+  )
 
 })