Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
* `with_mock()` and `local_mock()` have been unconditionally deprecated as
they will no longer work in future versions of R (#1999).

* `snapshot_accept()` now works also when the tested file contains dots in
the filename (@mcol #1669).

# testthat 3.2.1

* Fix incorrect format string detected by latest R-devel. Fix thanks to
Expand Down
6 changes: 4 additions & 2 deletions R/snapshot-manage.R
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,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("\\.md|\\.txt$", "", 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
Expand Down
16 changes: 16 additions & 0 deletions tests/testthat/_snaps/snapshot-manage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions tests/testthat/test-snapshot-manage.R
Original file line number Diff line number Diff line change
Expand Up @@ -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", {
Expand Down
Loading