Fix snapshot_accept/review filtering with variant snapshots#2332
Open
cderv wants to merge 2 commits into
Open
Conversation
Author
|
The CI failures are unrelated to this PR — they're about a new |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2325.
I ran into this while working on the tufte package, where snapshot tests use variants for different pandoc/citeproc versions. After a test failure,
snapshot_review("html")was reporting "No snapshots to update" even though a.new.file clearly existed.I stepped through
snapshot_meta()and the issue is in the filtering logic. For a variant snapshot like_snaps/my-variant/html.md, thenamecolumn ends up as"my-variant/html.md", so matching againstc("html", "html.md")fails. The documented behavior for thefilesargument says it can be "a snapshot name (e.g.fooorfoo.md)", which I believe should work regardless of whether the snapshot lives in a variant subdirectory.The fix adds a
basename(out$name)check to the filter. I kept the existingout$name %in% filescheck because it's still needed for fully qualified paths likesnapshot_accept("my-variant/html.md").I also added tests for filtering by test name with variants, including the case with multiple variant directories.