Merged origin/main into deprecate-mock

Author: hadley

.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

@@ -1,6 +1,6 @@
 Package: testthat
 Title: Unit Testing for R
-Version: 3.2.2.9000
+Version: 3.2.3.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre")),
     person("Posit Software, PBC", role = c("cph", "fnd")),

NAMESPACE

@@ -164,6 +164,7 @@ export(local_test_context)
 export(local_test_directory)
 export(make_expectation)
 export(matches)
+export(mock_output_sequence)
 export(new_expectation)
 export(not)
 export(prints_text)

NEWS.md

@@ -1,6 +1,10 @@
 # testthat (development version)
 
 * `local_mock()` and `with_mock()` have been deprecated because they are no longer permitted in R 4.5.
+* Fixed an issue preventing compilation from succeeding due to deprecation / removal of `std::uncaught_exception()` (@kevinushey, #2047).
+
+# testthat 3.2.3
+
 * Fixed an issue where `expect_no_error(1)` was failing (#2037).
 * Fixed an issue where calling `skip()` outside of an active test could
   cause an unexpected error (@kevinushey, #2039).

R/expect-known.R

@@ -215,5 +215,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"))
 }

R/mock2-helpers.R

@@ -0,0 +1,49 @@
+#' Mock a sequence of output from a function
+#'
+#' Specify multiple return values for mocking
+#'
+#' @param ... <[`dynamic-dots`][rlang::dyn-dots]> Values to return in sequence.
+#' @param recycle whether to recycle. If `TRUE`, once all values have been returned,
+#' they will be returned again in sequence.
+#'
+#' @return A function that you can use within `local_mocked_bindings()` and
+#' `with_mocked_bindings()`
+#' @export
+#'
+#' @examples
+#' # inside local_mocked_bindings()
+#' \dontrun{
+#' local_mocked_bindings(readline = mock_output_sequence("3", "This is a note", "n"))
+#' }
+#' # for understanding
+#' mocked_sequence <- mock_output_sequence("3", "This is a note", "n")
+#' mocked_sequence()
+#' mocked_sequence()
+#' mocked_sequence()
+#' try(mocked_sequence())
+#' recycled_mocked_sequence <- mock_output_sequence(
+#'   "3", "This is a note", "n",
+#'   recycle = TRUE
+#' )
+#' recycled_mocked_sequence()
+#' recycled_mocked_sequence()
+#' recycled_mocked_sequence()
+#' recycled_mocked_sequence()
+#' @family mocking
+mock_output_sequence <- function(..., recycle = FALSE) {
+  values <- rlang::list2(...)
+  i <- 1
+  function(...) {
+    if (i > length(values) && !recycle) {
+      cli::cli_abort(c(
+        "Can't find value for {i}th iteration.",
+        i = "{.arg ...} has only {length(values)} values.",
+        i = "You can set {.arg recycle} to {.code TRUE}."
+      ))
+    }
+    index <- (i - 1) %% length(values) + 1
+    value <- rep_len(values, length.out = index)[[index]]
+    i <<- i + 1
+    value
+  }
+}

R/mock2.R

@@ -92,6 +92,17 @@
 #'   my_wrapper = function(...) "new_value"
 #' )
 #' ```
+#'
+#' ## Multiple return values / sequence of outputs
+#'
+#' To mock a function that returns different values in sequence,
+#' for instance an API call whose status would be 502 then 200,
+#' or an user intput to `readline()`, you can use [mock_output_sequence()]
+#'
+#' ```R
+#' local_mocked_bindings(readline = mock_output_sequence("3", "This is a note", "n"))
+#' ```
+#'
 #' @export
 #' @param ... Name-value pairs providing new values (typically functions) to
 #'   temporarily replace the named bindings.
@@ -103,6 +114,7 @@
 #'   under active development (i.e. loaded with [pkgload::load_all()]).
 #'   We don't recommend using this to mock functions in other packages,
 #'   as you should not modify namespaces that you don't own.
+#' @family mocking
 local_mocked_bindings <- function(..., .package = NULL, .env = caller_env()) {
   bindings <- list2(...)
   check_bindings(bindings)
@@ -132,7 +144,7 @@ local_mocked_bindings <- function(..., .package = NULL, .env = caller_env()) {
     local_bindings_rebind(!!!bindings, .env = test_env, .frame = .env)
   }
 
-  if (any(!bindings_found)) {
+  if (!all(bindings_found)) {
     missing <- names(bindings)[!bindings_found]
     cli::cli_abort("Can't find binding for {.arg {missing}}")
   }

R/praise.R

@@ -21,8 +21,8 @@ praise <- function() {
     "\U0001f9ff Your tests look perfect \U0001f9ff",
     "\U0001f3af Your tests hit the mark \U0001f3af",
     "\U0001f41d Your tests are the bee's knees \U0001f41d",
-    "\U0001f4a3 Your tests are da bomb \U0001f4a3",
-    "\U0001f525 Your tests are lit \U0001f525"
+    "\U0001f3b8 Your tests rock \U0001f3b8",
+    "\U0001f44f Your tests get an ovation \U0001f44f"
   )
 
   x <- if (cli::is_utf8_output()) c(plain, utf8) else plain