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

Fix/reapply fixes #5

Merged
merged 3 commits into from
Aug 1, 2024
Merged

Fix/reapply fixes #5

merged 3 commits into from
Aug 1, 2024

Conversation

awaltzforvenus
Copy link

No description provided.

@awaltzforvenus awaltzforvenus changed the base branch from main to orm July 31, 2024 18:08
.appendingPathComponent("\(testName).\(identifier)")
.appendingPathExtension(snapshotting.pathExtension ?? "")

// Check the bundle for the resource first, then the file system

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you clean up the indenting of the code?

Copy link

@lj-dickey lj-dickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you done a local build of the puffin repo using this proposed commit? If it doesn't pass for you locally, I'm not sure if it will pass on CI, so it would be good to check. If it doesn't pass, we may still not be able to upgrade this library yet.

// But, if we're recording, don't bother checking the bundle, since we aren't comparing it to anything, and
// want the new file to be generated in the source directory, not the bundle.
var snapshotFileUrlCandidate: URL?
if record != .never {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't we want to check the bundle if the recording is never or missing? Because we'd need to know if the snapshot existed before deciding whether to record... So, this comparison seems incorrect - should it be record != .always? Then, if the file isn't found in the bundle, create it in the snapshot directory.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, good call. Will change.

@awaltzforvenus
Copy link
Author

Testing this locally before I call it good for another look.

@awaltzforvenus
Copy link
Author

Alright, I did run the puffin repo against this branch, and things are working as I expect them to, so I think this is good to go.

Copy link

@lj-dickey lj-dickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@awaltzforvenus awaltzforvenus merged commit ae98fdf into orm Aug 1, 2024
2 of 3 checks passed
@awaltzforvenus awaltzforvenus deleted the fix/reapply-fixes branch August 1, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants