Tweak message; improve frame hanlding

Author: hadley

R/snapshot-file.R

@@ -137,7 +137,6 @@ expect_snapshot_file <- function(
     path,
     file_equal = compare,
     variant = variant,
-    trace_env = caller_env()
   )
   if (inherits(equal, "expectation_failure")) {
     return(equal)
@@ -204,7 +203,7 @@ snapshot_file_equal <- function(
   trace_env = caller_env()
 ) {
   if (!file.exists(path)) {
-    cli::cli_abort("{.path {path}} not found.")
+    cli::cli_abort("{.path {path}} not found.", call = trace_env)
   }
 
   if (is.null(snap_variant)) {

tests/testthat/DELETE-ME

@@ -0,0 +1 @@
+If you see me, something has gone wrong with old-school teardown

tests/testthat/DELETE-ME-2

@@ -0,0 +1 @@
+If you see me, something has gone wrong with new-school teardown

tests/testthat/_snaps/snapshot-file.md

@@ -1,3 +1,11 @@
+# expect_snapshot_file finds duplicate snapshot files
+
+    Code
+      expect_snapshot_file(write_tmp_lines(r_version()), "version.txt", variant = r_version())
+    Condition
+      Error in `expect_snapshot_file()`:
+      ! Snapshot file names must be unique. `name` has already been used.
+
 # warns on first creation
 
     Code
@@ -11,7 +19,7 @@
     Code
       snapshot_file_equal_("doesnt-exist.txt")
     Condition
-      Error in `snapshot_file_equal()`:
+      Error in `snapshot_file_equal_()`:
       ! 'doesnt-exist.txt' not found.
 
 # snapshot_hint output differs in R CMD check

tests/testthat/test-snapshot-file.R

@@ -39,15 +39,13 @@ test_that("expect_snapshot_file works with variant", {
 })
 
 test_that("expect_snapshot_file finds duplicate snapshot files", {
-  # Save to the same file as in previous test
-  expect_error(
+  expect_snapshot(
     expect_snapshot_file(
       write_tmp_lines(r_version()),
       "version.txt",
-      compare = compare_file_text,
       variant = r_version()
     ),
-    "provide a unique snapshot file name"
+    error = TRUE
   )
 })