Make accept_snapshot() work on filenames containing a dot (#1669)

NEWS.md

@@ -1,5 +1,6 @@
 # testthat (development version)
 
+* `snapshot_accept()` now works also when the tested file contains dots in the filename (@mcol, #1669).
 * testthat now requires R 4.1.
 * `expect_s4_class()` now supports unquoting (@stibu81, #2064).
 * `it()` now finds the correct evaluation environment in more cases (@averissimo, #2085).

R/snapshot-manage.R

@@ -129,6 +129,7 @@ review_app <- function(name, old_path, new_path) {
 snapshot_meta <- function(files = NULL, path = "tests/testthat") {
   all <- dir(file.path(path, "_snaps"), recursive = TRUE, full.names = TRUE)
   cur <- all[!grepl("\\.new\\.", all)]
+  ext <- unique(tools::file_ext(cur))
 
   snap_file <- basename(dirname(cur)) != "_snaps"
   snap_test <- ifelse(snap_file, basename(dirname(cur)), gsub("\\.md$", "", basename(cur)))
@@ -161,9 +162,11 @@ snapshot_meta <- function(files = NULL, path = "tests/testthat") {
     files <- files[!is_dir]
 
     dirs <- substr(dirs, 1, nchar(dirs) - 1)
-    files <- ifelse(tools::file_ext(files) == "", paste0(files, ".md"), files)
+    files <- gsub(paste0("\\.", ext), "", files)
 
-    out <- out[out$name %in% files | out$test %in% dirs, , drop = FALSE]
+    out_name_sans_ext <- tools::file_path_sans_ext(out$name)
+    out <- out[out_name_sans_ext %in% files |
+               out$test %in% dirs, , drop = FALSE]
   }
 
   out

tests/testthat/_snaps/snapshot-manage.md

@@ -38,6 +38,22 @@
       Updating snapshots:
       * test/a.txt
 
+---
+
+    Code
+      snapshot_accept("test/c.d.md", path = path)
+    Message
+      Updating snapshots:
+      * test/c.d.md
+
+---
+
+    Code
+      snapshot_accept("test/c.d", path = path)
+    Message
+      Updating snapshots:
+      * test/c.d.md
+
 # can work with variants
 
     Code

tests/testthat/test-snapshot-manage.R

@@ -21,6 +21,15 @@ test_that("can accept specific files", {
   expect_snapshot(snapshot_accept("test/", path = path))
   expect_equal(dir(file.path(path, "_snaps"), recursive = TRUE), "test/a.txt")
 
+  ## file names with dots
+  path <- local_snapshot_dir(c("test/c.d.md", "test/c.d.new.md"))
+  expect_snapshot(snapshot_accept("test/c.d.md", path = path))
+  expect_equal(dir(file.path(path, "_snaps"), recursive = TRUE), "test/c.d.md")
+
+  path <- local_snapshot_dir(c("test/c.d.md", "test/c.d.new.md"))
+  expect_snapshot(snapshot_accept("test/c.d", path = path))
+  expect_equal(dir(file.path(path, "_snaps"), recursive = TRUE), "test/c.d.md")
+
 })
 
 test_that("can work with variants", {