Require R 4.1 (#2101)

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),

NEWS.md

@@ -1,5 +1,6 @@
 # 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).

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))))
 }

tests/testthat/_snaps/R4.0/snapshot-file/version.txt

@@ -78,7 +78,7 @@ test_that("can capture Throwable conditions from rJava", {
 
 test_that("capture correct trace_env (#1994)", {
   # This should fail, not error
-  expect_failure(expect_error(stop("oops")) %>% expect_warning())
+  expect_failure(expect_error(stop("oops")) |> expect_warning())
   expect_failure(expect_warning(expect_error(stop("oops"))))
 })
 

tests/testthat/_snaps/R4.0/snapshot.md

@@ -42,11 +42,8 @@ test_that("can control numeric tolerance", {
   expect_failure(expect_equal(x1, x2))
   expect_success(expect_equal(x1, x2, tolerance = 1e-5))
   expect_success(expect_equivalent(x1, x2, tolerance = 1e-5))
+  
   # with partial matching
-  # we work around https://github.com/r-lib/testthat/issues/1188
-  if (getRversion() < "3.6.0" && is.null(getOption("warnPartialMatchArgs"))) {
-    options(warnPartialMatchArgs = FALSE)
-  }
   withr::local_options(warnPartialMatchArgs = FALSE)
   expect_success(expect_equal(x1, x2, tol = 1e-5))
 

tests/testthat/test-expect-condition.R

@@ -27,8 +27,8 @@ test_that("expect_no_* don't emit success when they fail", {
 
 test_that("capture correct trace_env (#1994)", {
   # This should fail, not error
-  expect_failure(expect_message({message("a"); warn("b")}) %>% expect_no_warning())
-  expect_failure(expect_no_message({message("a"); warn("b")}) %>% expect_warning())
+  expect_failure(expect_message({message("a"); warn("b")}) |> expect_no_warning())
+  expect_failure(expect_no_message({message("a"); warn("b")}) |> expect_warning())
 })
 
 test_that("unmatched conditions bubble up", {

tests/testthat/test-expect-equality.R

@@ -1,5 +1,4 @@
 test_that("expect_snapshot_file works", {
-  skip_if_not(getRversion() >= "3.6.0")
   expect_snapshot_file(
     write_tmp_lines(letters),
     "foo.r",
@@ -33,7 +32,6 @@ test_that("expect_snapshot_file works", {
 
 
 test_that("expect_snapshot_file works in a different directory", {
-  skip_if_not(getRversion() >= "3.6.0")
   path <- withr::local_tempdir()
   withr::local_dir(path)
 

tests/testthat/test-expect-no-condition.R

@@ -13,8 +13,8 @@ test_that("basic workflow", {
   snapper <- local_snapshotter(path)
   snapper$start_file("snapshot-2")
   # output if not active (because test not set here)
-  expect_snapshot_output("x") %>%
-    expect_message("Can't save") %>%
+  expect_snapshot_output("x") |>
+    expect_message("Can't save") |>
     expect_output("[1] \"x\"", fixed = TRUE)
 
   # warns on first creation