Improve logic for variant cleanup (#1542)

Author: hadley

R/snapshot-file-snaps.R

@@ -76,11 +76,15 @@ FileSnaps <- R6::R6Class("FileSnaps", public = list(
     invisible()
   },
 
-  delete = function() {
-    unlink(self$path())
+  delete = function(variant = "_default") {
+    unlink(self$path(variant))
     invisible()
   },
 
+  variants = function() {
+    names(self$snaps)
+  },
+
   filename = function() {
     paste0(self$file, if (self$type == "new") ".new", ".md")
   },

R/snapshot-reporter.R

@@ -111,10 +111,12 @@ SnapshotReporter <- R6::R6Class("SnapshotReporter",
 
       self$cur_snaps$write()
 
-      if (length(self$variants_changed) >= 1) {
-        self$new_snaps$write(self$variants_changed)
-      } else {
-        self$new_snaps$delete()
+      for (variant in self$new_snaps$variants()) {
+        if (variant %in% self$variants_changed) {
+          self$new_snaps$write(variant)
+        } else {
+          self$new_snaps$delete(variant)
+        }
       }
     },
     end_reporter = function() {

tests/testthat/test-snapshot-reporter.R

@@ -73,6 +73,27 @@ test_that("only create new files for changed variants", {
   )
 })
 
+test_that("only reverting change in variant deletes .new", {
+  snapper <- local_snapshotter()
+  snapper$start_file("v", "test")
+  expect_warning(expect_snapshot_output("x", variant = "a"), "Adding new")
+  expect_warning(expect_snapshot_output("x", variant = "b"), "Adding new")
+  snapper$end_file()
+  expect_setequal(snapper$snap_files(), c("a/v.md", "b/v.md"))
+
+  # failure
+  snapper$start_file("v", "test")
+  expect_failure(expect_snapshot_output("y", variant = "a"))
+  snapper$end_file()
+  expect_setequal(snapper$snap_files(), c("a/v.md", "b/v.md", "a/v.new.md"))
+
+  # success
+  snapper$start_file("v", "test")
+  expect_success(expect_snapshot_output("x", variant = "a"))
+  snapper$end_file()
+  expect_setequal(snapper$snap_files(), c("a/v.md", "b/v.md"))
+})
+
 
 test_that("removing tests removes snap file", {
   path <- withr::local_tempdir()