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

MODULES-1202 - add module_spec_helper support for 3.6 config items #70

Merged
merged 2 commits into from
Jul 9, 2014
Merged

MODULES-1202 - add module_spec_helper support for 3.6 config items #70

merged 2 commits into from
Jul 9, 2014

Conversation

jantman
Copy link
Contributor

@jantman jantman commented Jul 9, 2014

This essentially extends #65 by also adding support for the "recommended and safe" 3.6 settings trusted_node_data, ordering, and stringify_facts. The first of these is most important to me, as it introduces $facts and $trusted as reserved variable names. The former of these is a param name on a define in puppetlabs-mcollective (which now doesn't work on 3.6 with trusted_node_data=true).

This will, AFAIK, need matching work in rspec-puppet. I'll see about getting to work on that.

@jantman
Copy link
Contributor Author

jantman commented Jul 9, 2014

cut rodjek/rspec-puppet#212 against rspec-puppet

@@ -24,9 +24,15 @@ def verify_contents(subject, title, expected_lines)
## These depend on rspec-puppet #209 and #183 being released
#c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes'
#c.strict_variables = true if ENV['STRICT_VARIABLES'] == 'yes'
#c.stringify_facts = false if ENV['STRINGIFY_FACTS'] == 'no'
#c.trusted_node_data = true if ENV['TRUSTED_NODE_DATA'] == 'yes'
#c.ordering = ENV['ORDERING'] if ENV['ORDERING']
Copy link
Contributor

Choose a reason for hiding this comment

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

If you could create similar PRs to rspec-puppet as #209 and comment here, that would be great. I'd rather maintain as little code in puppetlabs_spec_helper as possible if rspec-puppet makes better sense for it (which is pretty much true of all the code in PSH, but that's the eventual goal).

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh hey, I see rodjek/rspec-puppet#212 now :). So if you could just update the comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah it looks like our comments crossed in the ajax-y ether...

hunner added a commit that referenced this pull request Jul 9, 2014
MODULES-1202 - add module_spec_helper support for 3.6 config items
@hunner hunner merged commit 1345230 into puppetlabs:master Jul 9, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants