Correct failure propagation

Author: hadley

R/snapshot-file.R

@@ -139,6 +139,10 @@ expect_snapshot_file <- function(
     variant = variant,
     trace_env = caller_env()
   )
+  if (expectation_failure(equal)) {
+    return(equal)
+  }
+
   hint <- snapshot_review_hint(snapshotter$file, name)
 
   if (!equal) {
@@ -238,10 +242,8 @@ snapshot_file_equal <- function(
     # to record the value locally
     if (fail_on_new) {
       return(fail(message, trace_env = trace_env))
-    } else {
-      testthat_warn(message)
     }
-
+    testthat_warn(message)
     TRUE
   }
 }

R/snapshot-reporter.R

@@ -87,16 +87,13 @@ SnapshotReporter <- R6::R6Class(
         message <- paste0(
           "Adding new snapshot",
           if (variant != "_default") paste0(" for variant '", variant, "'"),
-          if (fail_on_new) " in CI",
           ":\n",
           value_enc
         )
         if (fail_on_new) {
-          fail(message, trace_env = trace_env)
-          return(NULL)
-        } else {
-          testthat_warn(message)
+          return(fail(message, trace_env = trace_env))
         }
+        testthat_warn(message)
         character()
       }
     },

R/snapshot.R

@@ -331,9 +331,8 @@ expect_snapshot_helper <- function(
     variant = variant,
     trace_env = trace_env
   )
-  # Comparison failed
-  if (is.null(comp)) {
-    return(invisible())
+  if (expectation_failure(comp)) {
+    return(comp)
   }
 
   if (!identical(variant, "_default")) {