error when applying value labels to Date (#157)

fix #156
larmarange · Mar 19, 2024 · b3be2c4 · b3be2c4
1 parent 035ad29
commit b3be2c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/R/val_labels.R b/R/val_labels.R
@@ -70,8 +70,8 @@ val_labels.data.frame <- function(x, prefixed = FALSE) {
     null_action = c("unclass", "labelled"),
     value) {
   null_action <- match.arg(null_action)
-  if (null_action == "labelled") {
-    x <- labelled(x, value, label = val_label(x))
+  if (!is.null(value) || null_action == "labelled") {
+    x <- labelled(x, value, label = var_label(x))
   }
   # otherwise do nothing
   x

diff --git a/tests/testthat/test-labelled.r b/tests/testthat/test-labelled.r
@@ -334,6 +334,10 @@ test_that(" 'val_label<-' works properly", {
   expect_error(val_label(df, 2:3) <- "a")
 
   sub_df <- df[, -match("ch", names(df))]
+
+  v <- as.Date("2023-01-01")
+  l <- as.Date(c("The first day of 2023" = "2023-01-01"))
+  expect_error(val_labels(v) <- l)
 })
 
 test_that(" 'val_label<-.data.frame' works properly", {