From 2375ee13ee50b61dd03b0e96145b8971f423b514 Mon Sep 17 00:00:00 2001
From: Daniel Sjoberg <danield.sjoberg@gmail.com>
Date: Mon, 8 Jul 2024 08:32:44 -0700
Subject: [PATCH] update

---
 R/ard_categorical.survey.design.R               |  2 +-
 .../_snaps/ard_categorical.survey.design.md     |  4 ++--
 .../test-ard_categorical.survey.design.R        | 17 ++++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/R/ard_categorical.survey.design.R b/R/ard_categorical.survey.design.R
index dcecc8eee..63cb9b0c8 100644
--- a/R/ard_categorical.survey.design.R
+++ b/R/ard_categorical.survey.design.R
@@ -120,7 +120,7 @@ ard_categorical.survey.design <- function(data,
   # return note about column names that result in errors -----------------------
   if (any(by %in% c("variable", "variable_level"))) {
     cli::cli_abort(
-      "The {.arg by} argument cannot include variables named {.val {c('variable', 'variable_level')}}",
+      "The {.arg by} argument cannot include variables named {.val {c('variable', 'variable_level')}}.",
       call = get_cli_abort_call()
     )
   }
diff --git a/tests/testthat/_snaps/ard_categorical.survey.design.md b/tests/testthat/_snaps/ard_categorical.survey.design.md
index 160a5189b..55c7abb1d 100644
--- a/tests/testthat/_snaps/ard_categorical.survey.design.md
+++ b/tests/testthat/_snaps/ard_categorical.survey.design.md
@@ -31,8 +31,8 @@
 # ard_categorical.survey.design(by) messages about protected names
 
     Code
-      ard_categorical(svy_trial, by = variable, variables = gear)
+      ard_categorical(svy_mtcars, by = variable, variables = gear)
     Condition
       Error in `ard_categorical()`:
-      ! The `by` argument cannot include variables named "variable" and "variable_level"
+      ! The `by` argument cannot include variables named "variable" and "variable_level".
 
diff --git a/tests/testthat/test-ard_categorical.survey.design.R b/tests/testthat/test-ard_categorical.survey.design.R
index d0e5c4db9..680032724 100644
--- a/tests/testthat/test-ard_categorical.survey.design.R
+++ b/tests/testthat/test-ard_categorical.survey.design.R
@@ -1175,15 +1175,26 @@ test_that("ard_categorical.survey.design() works with variables with only 1 leve
 
 
 test_that("ard_categorical.survey.design(by) messages about protected names", {
-  svy_trial <-
+  svy_mtcars <-
     survey::svydesign(
       ids = ~1,
-      data = mtcars |> dplyr::mutate(variable = am, variable_level = cyl),
+      data = mtcars |>
+        dplyr::mutate(
+          variable = am,
+          variable_level = cyl,
+          by = am,
+          by_level = cyl
+        ),
       weights = ~1
     )
 
   expect_snapshot(
     error = TRUE,
-    ard_categorical(svy_trial, by = variable, variables = gear)
+    ard_categorical(svy_mtcars, by = variable, variables = gear)
+  )
+
+  expect_error(
+    ard_categorical(svy_mtcars, by = variable_level, variables = gear),
+    'The `by` argument cannot include variables named "variable" and "variable_level".'
   )
 })