Merged origin/main into mcol-issue_1669

Author: hadley

DESCRIPTION

@@ -15,7 +15,7 @@ License: MIT + file LICENSE
 URL: https://testthat.r-lib.org, https://github.com/r-lib/testthat
 BugReports: https://github.com/r-lib/testthat/issues
 Depends:
-    R (>= 3.6.0)
+    R (>= 4.1.0)
 Imports:
     brio (>= 1.1.3),
     callr (>= 3.7.3),

NAMESPACE

@@ -189,6 +189,7 @@ export(skip_on_covr)
 export(skip_on_cran)
 export(skip_on_os)
 export(skip_on_travis)
+export(skip_unless_r)
 export(snapshot_accept)
 export(snapshot_review)
 export(source_dir)

NEWS.md

@@ -1,8 +1,11 @@
 # testthat (development version)
 
+* testthat now requires R 4.1.
+* `expect_s4_class()` now supports unquoting (@stibu81, #2064).
 * `it()` now finds the correct evaluation environment in more cases (@averissimo, #2085).
 * Fixed an issue preventing compilation from succeeding due to deprecation / removal of `std::uncaught_exception()` (@kevinushey, #2047).
 * `snapshot_accept()` now works also when the tested file contains dots in the filename (@mcol, #1669).
+* New `skip_unless_r()` to skip running tests on unsuitable versions of R, e.g. `skip_unless_r(">= 4.1.0")` to skip tests that require, say, `...names` (@MichaelChirico, #2022)
 
 # testthat 3.2.3
 

R/expect-inheritance.R

@@ -125,7 +125,7 @@ expect_s7_class <- function(object, class) {
 #' @rdname inheritance-expectations
 expect_s4_class <- function(object, class) {
   act <- quasi_label(enquo(object), arg = "object")
-  act_val_lab <- format_class(methods::is(object))
+  act$class <- format_class(methods::is(act$val))
   exp_lab <- format_class(class)
 
   if (identical(class, NA)) {
@@ -139,7 +139,7 @@ expect_s4_class <- function(object, class) {
     } else {
       expect(
         methods::is(act$val, class),
-        sprintf("%s inherits from %s not %s.", act$lab, act_val_lab, exp_lab)
+        sprintf("%s inherits from %s not %s.", act$lab, act$class, exp_lab)
       )
     }
   } else {

R/expect-self-test.R

@@ -19,7 +19,7 @@ new_capture("expectation_success")
 #' Tools for testing expectations
 #'
 #' @description
-#' * `expect_sucess()` and `expect_failure()` check that there's at least
+#' * `expect_success()` and `expect_failure()` check that there's at least
 #'   one success or failure respectively.
 #' * `expect_snapshot_failure()` records the failure message so that you can
 #'   manually check that it is informative.
@@ -94,6 +94,9 @@ expect_no_failure <- function(expr) {
 expect_snapshot_skip <- function(x, cran = FALSE) {
   expect_snapshot_error(x, class = "skip", cran = cran)
 }
+expect_skip <- function(code) {
+  expect_condition(code, class = "skip")
+}
 expect_no_skip <- function(code) {
   expect_no_condition(code, class = "skip")
 }

R/skip.R

@@ -126,6 +126,30 @@ package_version <- function(x) {
   utils::packageVersion(x)
 }
 
+#' @export
+#' @param spec A version specification like '>= 4.1.0' denoting that this test
+#'   should only be run on R versions 4.1.0 and later.
+#' @rdname skip
+skip_unless_r <- function(spec) {
+  parts <- unlist(strsplit(spec, " ", fixed = TRUE))
+  if (length(parts) != 2L) {
+    cli::cli_abort("{.arg spec} should be a comparison like '>=' and an R version separated by a space.")
+  }
+  comparator <- match.fun(parts[1L])
+  required_version <- numeric_version(parts[2L])
+
+  current_version <- getRversion()
+  skip_if_not(
+    comparator(current_version, required_version),
+    sprintf(
+      "Current R version (%s) does not satisfy requirement (%s %s)",
+      current_version, parts[1L], required_version
+    )
+  )
+}
+# for mocking
+getRversion <- NULL
+
 #' @export
 #' @rdname skip
 skip_if_offline <- function(host = "captive.apple.com") {

R/snapshot-cleanup.R

@@ -64,5 +64,5 @@ snapshot_expected <- function(
 }
 
 dir_contains <- function(paths, expected_files) {
-  map_lgl(paths, ~ any(file.exists(file.path(.x, expected_files))))
+  map_lgl(paths, \(path) any(file.exists(file.path(path, expected_files))))
 }