Merge branch 'main' into fix_resolve@main

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: teal
 Title: Exploratory Web Apps for Analyzing Clinical Trials Data
-Version: 0.14.0.9019
+Version: 0.14.0.9020
 Date: 2023-11-20
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),

R/validations.R

@@ -43,10 +43,8 @@ validate_has_data <- function(x,
                               complete = FALSE,
                               allow_inf = TRUE,
                               msg = NULL) {
-  stopifnot(
-    "Please provide a character vector in msg argument of validate_has_data." = is.character(msg) || is.null(msg)
-  )
-  validate(need(!is.null(x) && is.data.frame(x), "No data left."))
+  checkmate::assert_string(msg, null.ok = TRUE)
+  checkmate::assert_data_frame(x)
   if (!is.null(min_nrow)) {
     if (complete) {
       complete_index <- stats::complete.cases(x)

tests/testthat/test-validate_has_data.R

@@ -55,11 +55,11 @@ testthat::test_that("validate_has_data returns message msg argument is set and c
 testthat::test_that("validate_has_data returns throws error with non-character msg input", {
   testthat::expect_error(
     validate_has_data(data, 10, msg = 1),
-    "Please provide a character vector in msg argument of validate_has_data."
+    "Assertion on 'msg' failed: Must be of type 'string' \\(or 'NULL'\\), not 'double'"
   )
 
   testthat::expect_error(
     validate_has_data(data, 10, msg = TRUE),
-    "Please provide a character vector in msg argument of validate_has_data."
+    "Assertion on 'msg' failed: Must be of type 'string' \\(or 'NULL'\\), not 'logical'."
   )
 })