fix(testthat): Use muffle_expectation, not continue_test (#418)

Author: schloerke

DESCRIPTION

@@ -1,28 +1,28 @@
 Package: shinytest2
 Title: Testing for Shiny Applications
-Version: 0.4.1
-Authors@R:
-    c(
-        person("Barret", "Schloerke", role = c("cre", "aut"), email = "barret@posit.co", comment = c(ORCID = "0000-0001-9986-114X")),
-        person(family = "Posit Software, PBC", role = c("cph", "fnd")),
-        person("Winston", "Chang", role ="ctb", email = "winston@posit.co", comment = "Original author to rstudio/shinytest"),
-        person("Gábor", "Csárdi", role = "ctb", email = "gabor@posit.co", comment = "Original author to rstudio/shinytest"),
-        person("Hadley", "Wickham", role = "ctb", email = "hadley@posit.co", comment = "Original author to rstudio/shinytest"),
-        person(family = "Mango Solutions", role = c("cph", "ccp"), comment = "Original author to rstudio/shinytest")
-    )
-Description: Automated unit testing of Shiny applications through a headless 'Chromium' browser.
+Version: 0.4.1.9000
+Authors@R: c(
+    person("Barret", "Schloerke", , "barret@posit.co", role = c("cre", "aut"),
+           comment = c(ORCID = "0000-0001-9986-114X")),
+    person(, "Posit Software, PBC", role = c("cph", "fnd")),
+    person("Winston", "Chang", , "winston@posit.co", role = "ctb",
+           comment = "Original author to rstudio/shinytest"),
+    person("Gábor", "Csárdi", , "gabor@posit.co", role = "ctb",
+           comment = "Original author to rstudio/shinytest"),
+    person("Hadley", "Wickham", , "hadley@posit.co", role = "ctb",
+           comment = "Original author to rstudio/shinytest"),
+    person(, "Mango Solutions", role = c("cph", "ccp"),
+           comment = "Original author to rstudio/shinytest")
+  )
+Description: Automated unit testing of Shiny applications through a
+    headless 'Chromium' browser.
 License: MIT + file LICENSE
-Encoding: UTF-8
-Language: en-US
-Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
-URL: https://rstudio.github.io/shinytest2/, https://github.com/rstudio/shinytest2
+URL: https://rstudio.github.io/shinytest2/,
+    https://github.com/rstudio/shinytest2
 BugReports: https://github.com/rstudio/shinytest2/issues
-VignetteBuilder: knitr
 Depends:
-    testthat (>= 3.1.2)
+    testthat (>= 3.3.0)
 Imports:
-    R6 (>= 2.4.0),
     callr,
     checkmate (>= 2.0.0),
     chromote (>= 0.5.0),
@@ -31,12 +31,13 @@ Imports:
     globals (>= 0.14.0),
     httr,
     jsonlite,
+    lifecycle,
     pingr,
+    R6 (>= 2.4.0),
     rlang (>= 1.0.0),
     rmarkdown,
     shiny,
-    withr,
-    lifecycle
+    withr
 Suggests:
     deSolve,
     diffobj,
@@ -45,20 +46,24 @@ Suggests:
     plotly,
     png,
     rstudioapi,
-    shinyWidgets,
     shinytest (>= 1.5.1),
     shinyvalidate (>= 0.1.2),
+    shinyWidgets,
     showimage,
+    spelling,
     usethis,
-    vdiffr (>= 1.0.0),
-    spelling
-Config/Needs/check:
-    rstudio/shiny,
-    bslib
-Config/Needs/website:
-    pkgdown,
-    tidyverse/tidytemplate
+    vdiffr (>= 1.0.0)
+LinkingTo:
+    cpp11
+VignetteBuilder: 
+    knitr
+Config/Needs/check: rstudio/shiny, bslib
+Config/Needs/website: pkgdown, tidyverse/tidytemplate
 Config/testthat/edition: 3
+Encoding: UTF-8
+Language: en-US
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.3.3
 Collate:
     'R6-helper.R'
     'app-driver-chromote.R'
@@ -101,5 +106,3 @@ Collate:
     'shinytest2-package.R'
     'test-app.R'
     'use.R'
-LinkingTo:
-    cpp11

NEWS.md

@@ -1,3 +1,7 @@
+# shinytest2 (development version)
+
+* Fixed internal bug where `{testthat}` v3.3.0 changed expectation behavior for screenshot snapshots within `App$expect_values()` (#418).
+
 # shinytest2 0.4.1
 
 ## Bug

R/app-driver-expect-download.R

@@ -96,6 +96,11 @@ app_expect_download <- function(
   ckm8_assert_app_driver(self, private)
   rlang::check_dots_empty()
 
+  ## Announce snapshot file
+  # Cannot announce before download because we need the filename
+  # from the Content-Disposition header... which is after we download the file
+  # Therefore, we cannot announce the testthat file
+
   snapshot_info <- app_download(
     self,
     private,

R/app-driver-expect-screenshot.R

@@ -115,6 +115,9 @@ app_expect_screenshot <- function(
 
   filename <- app_next_temp_snapshot_path(self, private, name, "png")
 
+  # Announce snapshot file before touching before any other expressions can fail
+  testthat::announce_snapshot_file(filename)
+
   # Take screenshot
   self$get_screenshot(
     file = filename,

R/app-driver-expect-values.R

@@ -193,6 +193,16 @@ app_expect_values <- function(
   )
 
   json_path <- app_next_temp_snapshot_path(self, private, name, "json")
+  # `NAME.json` -> `NAME_.png`; `NAME_.new.png`
+  png_path <-
+    fs::path_ext_set(
+      paste0(fs::path_ext_remove(json_path), "_"),
+      "png"
+    )
+
+  # Announce snapshot file before touching before any other expressions can fail
+  testthat::announce_snapshot_file(json_path)
+  testthat::announce_snapshot_file(png_path)
 
   url <- app_get_shiny_test_url(
     self,
@@ -238,13 +248,6 @@ app_expect_values <- function(
     withCallingHandlers(
       # swallow expectation
       {
-        # nolint
-        # `NAME.json` -> `NAME_.png`; `NAME_.new.png`
-        png_path <-
-          fs::path_ext_set(
-            paste0(fs::path_ext_remove(json_path), "_"),
-            "png"
-          )
         # Take screenshot using snapshot expectation.
         # Skip the variant check in `$expect_snapshot()`
         # Leverage testthat snapshot logic, but muffle any expectation output
@@ -258,8 +261,8 @@ app_expect_values <- function(
       # Muffle any expectation (good or bad) thrown by testthat
       expectation = function(ex) {
         # Continue, skipping the signaling of the condition
-        # https://github.com/r-lib/testthat/blob/38c087d3bb5ec3c098c181f1e58a55c687268fba/R/expectation.R#L32-L34
-        invokeRestart("continue_test")
+        # https://github.com/r-lib/testthat/pull/2271/files#diff-eeb22563925ae9725656cfbfc44bd5001428734041747d5d90d364464e8e651cR107
+        invokeRestart("muffle_expectation")
       }
     )
   }