Record if we're in a check reporter

Author: hadley

R/expect-that.R

@@ -18,7 +18,6 @@
 #'   informative traceack for failures. You should only need to set this if
 #'   you're calling `fail()` from a helper function; see
 #'   `vignette("custom-expectation")` for details.
-#' @param snapshot Is this a snapshot failure?
 #' @param trace An optional backtrace created by [rlang::trace_back()].
 #'   When supplied, the expectation is displayed with the backtrace.
 #'   Expert use only.

R/reporter-check.R

@@ -13,6 +13,7 @@ CheckReporter <- R6::R6Class(
     skips = NULL,
     warnings = NULL,
     n_ok = 0L,
+    old_in_check_reporter = NULL,
 
     initialize = function(...) {
       self$capabilities$parallel_support <- TRUE
@@ -35,7 +36,14 @@ CheckReporter <- R6::R6Class(
       }
     },
 
+    start_reporter = function() {
+      self$old_in_check_reporter <- in_check_reporter()
+      the$in_check_reporter <- TRUE
+    },
+
     end_reporter = function() {
+      the$in_check_reporter <- self$old_in_check_reporter
+
       if (self$skips$size() || self$warnings$size() || self$problems$size()) {
         self$cat_line(summary_line(
           n_fail = self$problems$size(),

R/snapshot-file.R

@@ -142,7 +142,7 @@ expect_snapshot_file <- function(
     return(equal)
   }
 
-  if (in_rcmd_check()) {
+  if (in_check_reporter()) {
     hint <- ""
   } else {
     hint <- snapshot_review_hint(snapshotter$file, name)

R/snapshot.R

@@ -340,7 +340,7 @@ expect_snapshot_helper <- function(
   } else {
     variant_lab <- ""
   }
-  if (in_rcmd_check()) {
+  if (in_check_reporter()) {
     hint <- ""
   } else {
     hint <- snapshot_accept_hint(variant, snapshotter$file)

R/testthat-package.R

@@ -22,6 +22,7 @@ the <- new.env(parent = emptyenv())
 the$description <- character()
 the$top_level_test <- TRUE
 the$test_expectations <- 0
+the$in_check_reporter <- FALSE
 
 # The following block is used by usethis to automatically manage
 # roxygen namespace tags. Modify with care!

R/utils.R

@@ -51,8 +51,8 @@ first_upper <- function(x) {
   x
 }
 
-in_rcmd_check <- function() {
-  nzchar(Sys.getenv("_R_CHECK_PACKAGE_NAME_", ""))
+in_check_reporter <- function() {
+  isTRUE(the$in_check_reporter)
 }
 
 r_version <- function() paste0("R", getRversion()[, 1:2])