Merge branch 'r-lib:main' into feature/desc_filter_improvement

Author: kubajal

.github/workflows/R-CMD-check.yaml

@@ -8,7 +8,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
 name: R-CMD-check.yaml
 

.github/workflows/pkgdown.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
   release:
     types: [published]
   workflow_dispatch:

.github/workflows/test-coverage.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
 name: test-coverage.yaml
 
@@ -35,14 +34,16 @@ jobs:
             clean = FALSE,
             install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
           covr::to_cobertura(cov)
         shell: Rscript {0}
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
-          fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
-          file: ./cobertura.xml
-          plugin: noop
+          # Fail if error if not on PR, or if on PR and token is given
+          fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
+          files: ./cobertura.xml
+          plugins: noop
           disable_search: true
           token: ${{ secrets.CODECOV_TOKEN }}
 

DESCRIPTION

@@ -15,13 +15,12 @@ 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),
     cli (>= 3.6.1),
     desc (>= 1.4.2),
-    digest (>= 0.6.33),
     evaluate (>= 1.0.1),
     jsonlite (>= 1.8.7),
     lifecycle (>= 1.0.3),
@@ -40,6 +39,7 @@ Suggests:
     covr,
     curl (>= 0.9.5),
     diffviewer (>= 0.1.0),
+    digest (>= 0.6.33),
     knitr,
     rmarkdown,
     rstudioapi,
@@ -56,4 +56,4 @@ Config/testthat/parallel: true
 Config/testthat/start-first: watcher, parallel*
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE, r6 = FALSE)
-RoxygenNote: 7.3.2.9000
+RoxygenNote: 7.3.2

NAMESPACE

@@ -119,6 +119,7 @@ export(expect_s3_class)
 export(expect_s4_class)
 export(expect_s7_class)
 export(expect_setequal)
+export(expect_shape)
 export(expect_silent)
 export(expect_snapshot)
 export(expect_snapshot_error)
@@ -189,6 +190,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,5 +1,14 @@
 # testthat (development version)
 
+* `local_edition()` now gives a useful error for bad values (#1547).
+* 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).
+* 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)
+* `skip_on_os()` gains an option `"emscripten"` of the `os` argument to skip tests on Emscripten (@eitsupi, #2103).
+* New expectation, `expect_shape()`, for testing the shape (i.e., the `length()`, `nrow()`, `ncol()`, or `dim()`), all in one place (#1423, @michaelchirico).
+
 # testthat 3.2.3
 
 * Fixed an issue where `expect_no_error(1)` was failing (#2037).

R/describe.R

@@ -94,5 +94,5 @@ it <- function(description, code = NULL) {
   check_string(description, allow_empty = FALSE)
 
   code <- substitute(code)
-  describe_it(description, code)
+  describe_it(description, code, env = parent.frame())
 }

R/edition.R

@@ -61,8 +61,7 @@ edition_name <- function(x) {
 #' @param x Edition Should be a single integer.
 #' @param .env Environment that controls scope of changes. For expert use only.
 local_edition <- function(x, .env = parent.frame()) {
-  stopifnot(is_zap(x) || (is.numeric(x) && length(x) == 1))
-
+  check_number_whole(x, min = 2, max = 3)
   local_bindings(edition = x, .env = the, .frame = .env)
 }
 

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-known.R

@@ -191,6 +191,7 @@ expect_equal_to_reference <- function(..., update = FALSE) {
 #' @param hash Known hash value. Leave empty and you'll be informed what
 #'   to use in the test output.
 expect_known_hash <- function(object, hash = NULL) {
+  check_installed("digest")
   edition_deprecate(3, "expect_known_hash()",
     "Please use `expect_snapshot_value()` instead"
   )
@@ -215,5 +216,5 @@ expect_known_hash <- function(object, hash = NULL) {
 }
 
 all_utf8 <- function(x) {
-  ! any(is.na(iconv(x, "UTF-8", "UTF-8")))
+  !anyNA(iconv(x, "UTF-8", "UTF-8"))
 }