Merge branch 'main' into just-use-mac-release-020-knit-app

* main:
  Add updated snaps (#331)
  Add extra snap diff info for images as it is nice to see the worst offenders

Author: schloerke

DESCRIPTION

@@ -25,6 +25,7 @@ Imports:
     utils,
     withr
 Suggests:
+    cli,
     dplyr,
     english,
     httpuv,
@@ -35,6 +36,7 @@ Suggests:
     rsconnect (>= 1.0.1),
     shiny,
     shinytest,
+    shinytest2,
     testthat,
     tibble,
     tidyr,

R/accept_snaps.R

@@ -12,9 +12,11 @@ accept_snaps <- function(
 
   pb <- progress_bar(
     total = length(app_paths),
-    format = ":name [:bar] :current/:total"
+    format = ":name [:bar] :current/:total [:elapsed;:eta]"
   )
 
+  snaps_diffs <- list()
+
   for (app_path in app_paths) {
     pb$tick(tokens = list(name = basename(app_path)))
     withr::with_dir(app_path, {
@@ -24,10 +26,43 @@ accept_snaps <- function(
       snaps_info <- testthat__snapshot_meta()
       if (nrow(snaps_info) == 0) next
 
-      cat("\n") # Fresh line for printing
-      testthat::snapshot_accept()
+      Map(snaps_info$cur, snaps_info$new, f = function(snap_path, new_snap_path) {
+        if (!grepl("\\.png$", snap_path)) {
+          return()
+        }
+
+        snaps_diffs[[file.path(app_path, snap_path)]] <<-
+          shinytest2::screenshot_max_difference(
+            old = snap_path, new = new_snap_path
+          )
+
+        NULL
+      })
+      ignore <- capture.output(
+        type = "message",
+        {
+          testthat::snapshot_accept()
+        }
+      )
     })
   }
+
+  if (length(snaps_diffs) > 0) {
+    snaps_diffs <- unlist(snaps_diffs)
+
+    snaps_diffs_big <- snaps_diffs[snaps_diffs > 10]
+    if (length(snaps_diffs_big) > 0) {
+      snaps_diffs_big <- sort(snaps_diffs_big, decreasing = FALSE)
+      ul <- cli::cli_ul()
+      Map(names(snaps_diffs_big), snaps_diffs_big, f = function(name, diff) {
+        cli::cli_li("{.file {name}}: {format(diff, nsmall = 2)}")
+      })
+      cli::cli_end(ul)
+      hist(snaps_diffs, main = "Histogram of snapshot diffs", xlab = "shinytest2::screenshot_max_difference()")
+    }
+  }
+
+  invisible(snaps_diffs)
 }
 
 

inst/apps/001-hello/tests/testthat/_snaps/windows-4.1/mytest/003.json

@@ -4,7 +4,7 @@
   },
   "output": {
     "distPlot": {
-      "src": "[image data hash: 801ec2310c3fb48a9efaecd0bebb4a29]",
+      "src": "[image data hash: cc4c1a7b47d19528aedc8cc64145c730]",
       "width": 631.3281,
       "height": 400,
       "alt": "Plot object",