Support loading from .fixtures.yaml too #110
Merged
Conversation
This file contains 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
YAML can have multiple extensions, .yml and .yaml. Hiera has used .yaml all over the place but for some reason the spec_helper gets extremely sad when you have a fixtures.yaml instead. This is annoying for the end user and easily dealt with in code. Additionally we now actually catch Psych::SyntaxError and abort in that case instead of just checking for `Error::ENOENT` and returning before. I'm not even sure if the `if not fixtures` would ever be triggered since a syntax error would actually raise an error we were not rescuing.
| rescue Error::ENOENT | ||
| return {} | ||
| rescue Psych::SyntaxError | ||
| abort("malformed #{fixtures_yaml}") |
There was a problem hiding this comment.
Do we want to give the raised error message from psych here too?
hunner
added a commit
that referenced
this pull request
Jul 27, 2015
Support loading from .fixtures.yaml too
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.
YAML can have multiple extensions,
.ymland.yaml. Hiera has used.yamlall over the place but for some reason the spec_helper getsextremely sad (it doesn't load anything) when you have a
.fixtures.yamlinstead. This is annoying for the end user and easily dealt with in code.
Additionally we now actually catch
Psych::SyntaxErrorand abort inthat case instead of just checking for
Error::ENOENTand returningbefore. I'm not even sure if the
if not fixtureswould ever betriggered since a syntax error would actually raise an error we
were not rescuing.