Start v1.7.5.1 release candidate

rstudio · Oct 5, 2023 · e888f43 · e888f43
1 parent 0b97ee1
commit e888f43
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# shiny 1.7.5.1
+
+## Bug fixes
+
+* On r-devel (R > 4.3.1), `isTruthy(NULL)` now returns `FALSE` (as it does with older versions of R). (#3906)
+
 # shiny 1.7.5
 
 ## Possibly breaking changes

diff --git a/R/utils.R b/R/utils.R
@@ -1240,14 +1240,12 @@ dotloop <- function(fun_, ...) {
 #' @param x An expression whose truthiness value we want to determine
 #' @export
 isTruthy <- function(x) {
+  if (is.null(x))
+    return(FALSE)
   if (inherits(x, 'try-error'))
     return(FALSE)
-
   if (!is.atomic(x))
     return(TRUE)
-
-  if (is.null(x))
-    return(FALSE)
   if (length(x) == 0)
     return(FALSE)
   if (all(is.na(x)))

diff --git a/tests/testthat/test-tabPanel.R b/tests/testthat/test-tabPanel.R
@@ -18,6 +18,9 @@ expect_snapshot2 <- function(...) {
   if (getRversion() < "3.6.0") {
     skip("Skipping snapshots on R < 3.6 because of different RNG method")
   }
+  if (packageVersion("htmltools") <= "0.5.6" && getRversion() > "4.3.1") {
+    skip("Skipping snapshots since htmltools is 'outdated'")
+  }
   expect_snapshot(...)
 }