Merge commit '551f1018e62da2811bcd2a82032efef133b85d95'

Author: hadley

.claude/settings.local.json

@@ -1,8 +1,12 @@
 {
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "permissions": {
     "allow": [
-      "Bash(find:*)"
+      "Bash(find:*)",
+      "Bash(R:*)",
+      "Bash(rm:*)",
+      "Bash(air format:*)"
     ],
     "deny": []
   }
-}
+}

CLAUDE.md

@@ -8,15 +8,16 @@ testthat is R's most popular unit testing framework, used by thousands of CRAN p
 
 ## Key Development Commands
 
-### Testing
-- `devtools::test()` or `Ctrl/Cmd+Shift+T` in RStudio - Run all tests
-- `devtools::test_file("tests/testthat/test-filename.R")` - Run tests in a specific file
-- `testthat::test_local()` - Run tests for local source package
-- `testthat::test_package("testthat")` - Run tests for installed package
-- `R CMD check` - Full package check including tests
+General advice:
+* When running R from the console, always run it with `--quiet --vanilla`
+* Always run `air format .` after generating code
+
+### Development tools
 
-### Building and Installation
-- `devtools::load_all()` or `Ctrl/Cmd+Shift+L` - Load package for development
+- `devtools::test()` - Run all tests
+- `devtools::test_file("tests/testthat/test-filename.R")` - Run tests in a specific file
+- DO NOT USE `devtools::test_active_file()`
+- `devtools::load_all()` - Load package for development
 - `devtools::document()` - Generate documentation
 - `devtools::check()` - Run R CMD check
 - `devtools::install()` - Install package locally

DESCRIPTION

@@ -17,23 +17,23 @@ BugReports: https://github.com/r-lib/testthat/issues
 Depends:
     R (>= 4.1.0)
 Imports:
-    brio (>= 1.1.3),
-    callr (>= 3.7.3),
-    cli (>= 3.6.1),
-    desc (>= 1.4.2),
-    evaluate (>= 1.0.1),
-    jsonlite (>= 1.8.7),
-    lifecycle (>= 1.0.3),
+    brio (>= 1.1.5),
+    callr (>= 3.7.6),
+    cli (>= 3.6.5),
+    desc (>= 1.4.3),
+    evaluate (>= 1.0.4),
+    jsonlite (>= 2.0.0),
+    lifecycle (>= 1.0.4),
     magrittr (>= 2.0.3),
     methods,
-    pkgload (>= 1.3.2.1),
+    pkgload (>= 1.4.0),
     praise (>= 1.0.0),
-    processx (>= 3.8.2),
-    ps (>= 1.7.5),
-    R6 (>= 2.5.1),
-    rlang (>= 1.1.1),
+    processx (>= 3.8.6),
+    ps (>= 1.9.1),
+    R6 (>= 2.6.1),
+    rlang (>= 1.1.6),
     utils,
-    waldo (>= 0.6.0),
+    waldo (>= 0.6.2),
     withr (>= 3.0.2)
 Suggests:
     covr,

NAMESPACE

@@ -114,6 +114,7 @@ export(expect_no_warning)
 export(expect_null)
 export(expect_output)
 export(expect_output_file)
+export(expect_r6_class)
 export(expect_reference)
 export(expect_s3_class)
 export(expect_s4_class)
@@ -228,5 +229,6 @@ import(rlang)
 importFrom(R6,R6Class)
 importFrom(brio,readLines)
 importFrom(brio,writeLines)
+importFrom(lifecycle,deprecated)
 importFrom(magrittr,"%>%")
 useDynLib(testthat, .registration = TRUE)

NEWS.md

@@ -1,6 +1,17 @@
 # testthat (development version)
 
 * Interrupting a test now prints the test name. This makes it easier to tell where a very slow test might be hanging (#1464)
+* `describe()`, `it()`, and `test_that()` now have a shared stack of descriptions so that if you nest any inside of each other, any resulting failures will show you the full path.
+* `describe()` now correctly scopes `skip()` (#2007).
+* `ParallelProgressReporter` now respect `max_failures` (#1162).
+* The last snapshot is no longer lost if the snapshot file is missing the final newline (#2092). It's easy to accidentally remove this because there are two trailing new lines in snapshot files and many editors will automatically remove if you touch the file.
+* New `expect_r6_class()` (#2030).
+* `expect_*()` functions consistently and rigorously check their inputs (#1754). 
+* `JunitReporter()` no longer fails with `"no applicable method for xml_add_child"` for warnings outside of tests (#1913). Additionally, warnings now save their backtraces.
+* `JunitReporter()` strips ANSI escapes in more placese (#1852, #2032).
+* `try_again()` is now publicised. The first argument is now the number of retries, not tries (#2050).
+* `vignette("custom-expectations)` has been overhauled to make it much clearer how to create high-quality expectations (#2113, #2132, #2072).
+* `expect_snapshot()` and friends will now fail when creating a new snapshot on CI. This is usually a signal that you've forgotten to run it locally before committing (#1461).
 * `expect_snapshot_value()` can now handle expressions that generate `-` (#1678) or zero length atomic vectors (#2042).
 * `expect_matches()` failures should be a little easier to read (#2135).
 * New `local_on_cran(TRUE)` allows you to simulate how your tests will run on CRAN (#2112).

R/auto-test.R

@@ -1,24 +1,18 @@
 #' Watches code and tests for changes, rerunning tests as appropriate.
 #'
+#' @description
+#' `r lifecycle::badge("superseded")`
+#'
 #' The idea behind `auto_test()` is that you just leave it running while
 #' you develop your code.  Every time you save a file it will be automatically
 #' tested and you can easily see if your changes have caused any test
-#'  failures.
+#' failures.
 #'
 #' The current strategy for rerunning tests is as follows:
 #'
 #' - if any code has changed, then those files are reloaded and all tests
 #'   rerun
 #' - otherwise, each new or modified test is run
-#'
-#' In the future, `auto_test()` might implement one of the following more
-#' intelligent alternatives:
-#'
-#' - Use codetools to build up dependency tree and then rerun tests only
-#'   when a dependency changes.
-#' - Mimic ruby's autotest and rerun only failing tests until they pass,
-#'   and then rerun all tests.
-#
 #' @seealso [auto_test_package()]
 #' @export
 #' @param code_path path to directory containing code
@@ -27,7 +21,7 @@
 #' @param env environment in which to execute test suite.
 #' @param hash Passed on to [watch()]. When FALSE, uses less accurate
 #'   modification time stamps, but those are faster for large files.
-#' @keywords debugging
+#' @keywords internal
 auto_test <- function(
   code_path,
   test_path,
@@ -67,15 +61,12 @@ auto_test <- function(
   watch(c(code_path, test_path), watcher, hash = hash)
 }
 
-#' Watches a package for changes, rerunning tests as appropriate.
-#'
 #' @param pkg path to package
 #' @export
 #' @param reporter test reporter to use
 #' @param hash Passed on to [watch()].  When FALSE, uses less accurate
 #'   modification time stamps, but those are faster for large files.
-#' @keywords debugging
-#' @seealso [auto_test()] for details on how method works
+#' @rdname auto_test
 auto_test_package <- function(
   pkg = ".",
   reporter = default_reporter(),

R/compare.R

@@ -16,8 +16,8 @@ compare <- function(x, y, ...) {
 }
 
 comparison <- function(equal = TRUE, message = "Equal") {
-  stopifnot(is.logical(equal), length(equal) == 1)
-  stopifnot(is.character(message))
+  check_bool(equal)
+  check_character(message)
 
   structure(
     list(

R/deprec-condition.R

@@ -129,7 +129,7 @@ capture_warnings <- function(code, ignore_deprecation = FALSE) {
 }
 
 get_messages <- function(x) {
-  vapply(x, cnd_message, FUN.VALUE = character(1))
+  map_chr(x, cnd_message)
 }
 
 #' Is an error informative?

R/describe.R

@@ -56,43 +56,17 @@
 #'     it("can handle division by 0") #not yet implemented
 #'   })
 #' })
-
 describe <- function(description, code) {
-  check_string(description, allow_empty = FALSE)
-  describe_description <- description
-
-  # prepares a new environment for each it-block
-  describe_environment <- new.env(parent = parent.frame())
-  describe_environment$it <- function(description, code = NULL) {
-    check_string(description, allow_empty = FALSE)
-    code <- substitute(code)
-
-    description <- paste0(describe_description, ": ", description)
-    describe_it(description, code, describe_environment)
-  }
-
-  eval(substitute(code), describe_environment)
-  invisible()
-}
-
-describe_it <- function(description, code, env = parent.frame()) {
-  reporter <- get_reporter() %||% local_interactive_reporter()
-  local_test_context()
+  local_description_push(description)
 
-  test_code(
-    description,
-    code,
-    env = env,
-    reporter = reporter,
-    skip_on_empty = FALSE
-  )
+  test_code(code, parent.frame(), skip_on_empty = FALSE)
 }
 
 #' @export
 #' @rdname describe
 it <- function(description, code = NULL) {
-  check_string(description, allow_empty = FALSE)
+  local_description_push(description)
 
   code <- substitute(code)
-  describe_it(description, code, env = parent.frame())
+  test_code(code, env = parent.frame(), skip_on_empty = FALSE)
 }

R/expect-comparison.R

@@ -54,35 +54,35 @@ expect_compare_ <- function(
 #' @export
 #' @rdname comparison-expectations
 expect_lt <- function(object, expected, label = NULL, expected.label = NULL) {
-  act <- quasi_label(enquo(object), label, arg = "object")
-  exp <- quasi_label(enquo(expected), expected.label, arg = "expected")
+  act <- quasi_label(enquo(object), label)
+  exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_("<", act, exp)
 }
 
 #' @export
 #' @rdname comparison-expectations
 expect_lte <- function(object, expected, label = NULL, expected.label = NULL) {
-  act <- quasi_label(enquo(object), label, arg = "object")
-  exp <- quasi_label(enquo(expected), expected.label, arg = "expected")
+  act <- quasi_label(enquo(object), label)
+  exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_("<=", act, exp)
 }
 
 #' @export
 #' @rdname comparison-expectations
 expect_gt <- function(object, expected, label = NULL, expected.label = NULL) {
-  act <- quasi_label(enquo(object), label, arg = "object")
-  exp <- quasi_label(enquo(expected), expected.label, arg = "expected")
+  act <- quasi_label(enquo(object), label)
+  exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_(">", act, exp)
 }
 
 #' @export
 #' @rdname comparison-expectations
 expect_gte <- function(object, expected, label = NULL, expected.label = NULL) {
-  act <- quasi_label(enquo(object), label, arg = "object")
-  exp <- quasi_label(enquo(expected), expected.label, arg = "expected")
+  act <- quasi_label(enquo(object), label)
+  exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_(">=", act, exp)
 }