Snapshot hint override (#1608)

Fixes #1606

DESCRIPTION

@@ -23,7 +23,7 @@ Depends:
 Imports:
     brio,
     callr (>= 3.5.1),
-    cli (>= 3.1.1),
+    cli (>= 3.3.0),
     crayon (>= 1.3.4),
     desc,
     digest,

NEWS.md

@@ -1,5 +1,7 @@
 # testthat (development version)
 
+* Minor tweaks to output for latest cli (#1606).
+
 # testthat 3.1.3
 
 * Package that explicitly depend on rlang in their description file

R/local.R

@@ -121,15 +121,18 @@ local_reproducible_output <- function(width = 80,
   withr::local_collate("C", .local_envir = .env)
 }
 
-waldo_compare <- function(x, y, ..., x_arg = "x", y_arg = "y") {
-
+local_reporter_output <- function(.env = parent.frame()) {
   reporter <- get_reporter()
   if (!is.null(reporter)) {
-    # Need to very carefully isolate this change to this function - can not set
-    # in expectation functions because part of expectation handling bubbles
-    # up through calling handlers, which are run before on.exit()
-    reporter$local_user_output()
+    reporter$local_user_output(.env)
   }
+}
+
+waldo_compare <- function(x, y, ..., x_arg = "x", y_arg = "y") {
+  # Need to very carefully isolate this change to this function - can not set
+  # in expectation functions because part of expectation handling bubbles
+  # up through calling handlers, which are run before on.exit()
+  local_reporter_output()
 
   waldo::compare(x, y,..., x_arg = x_arg, y_arg = y_arg)
 }

R/snapshot.R

@@ -395,6 +395,8 @@ expect_snapshot_helper <- function(lab, val,
 }
 
 snapshot_accept_hint <- function(variant, file) {
+  local_reporter_output()
+
   if (is.null(variant) || variant == "_default") {
     name <- file
   } else {

tests/testthat/_snaps/snapshot.md

@@ -243,11 +243,11 @@
     Code
       cat(snapshot_accept_hint("_default", "bar.R"))
     Output
-      * Run `snapshot_accept('bar.R')` to accept the change
-      * Run `snapshot_review('bar.R')` to interactively review the change
+      * Run `]8;;rstudio:run:testthat::snapshot_accept('bar.R')snapshot_accept('bar.R')]8;;` to accept the change
+      * Run `]8;;rstudio:run:testthat::snapshot_review('bar.R')snapshot_review('bar.R')]8;;` to interactively review the change
     Code
       cat(snapshot_accept_hint("foo", "bar.R"))
     Output
-      * Run `snapshot_accept('foo/bar.R')` to accept the change
-      * Run `snapshot_review('foo/bar.R')` to interactively review the change
+      * Run `]8;;rstudio:run:testthat::snapshot_accept('foo/bar.R')snapshot_accept('foo/bar.R')]8;;` to accept the change
+      * Run `]8;;rstudio:run:testthat::snapshot_review('foo/bar.R')snapshot_review('foo/bar.R')]8;;` to interactively review the change
 

tests/testthat/test-snapshot.R

@@ -184,6 +184,8 @@ test_that("errors and warnings are folded", {
 })
 
 test_that("hint is informative", {
+  withr::local_options(cli.hyperlink = TRUE)
+
   expect_snapshot({
     cat(snapshot_accept_hint("_default", "bar.R"))
     cat(snapshot_accept_hint("foo", "bar.R"))