From da984194d0e0724c92cbb1b625e0d90c0aeda373 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Wed, 11 Feb 2015 09:51:30 -0800 Subject: [PATCH] Enable future parser testing rspec-puppet#183 was merged and released in 2.0, so we can now take advantage of the future parser. --- lib/puppetlabs_spec_helper/module_spec_helper.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/puppetlabs_spec_helper/module_spec_helper.rb b/lib/puppetlabs_spec_helper/module_spec_helper.rb index 0c737ce8..f4600a0c 100644 --- a/lib/puppetlabs_spec_helper/module_spec_helper.rb +++ b/lib/puppetlabs_spec_helper/module_spec_helper.rb @@ -21,8 +21,8 @@ def verify_contents(subject, title, expected_lines) RSpec.configure do |c| c.module_path = module_path c.manifest_dir = File.join(fixture_path, 'manifests') - ## These depend on rspec-puppet #209 and #183 being released - #c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes' + c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes' + ## This depends on rspec-puppet #209 being released #c.strict_variables = true if ENV['STRICT_VARIABLES'] == 'yes' ## These depend on rspec-puppet #212 being released #c.stringify_facts = false if ENV['STRINGIFY_FACTS'] == 'no' @@ -31,7 +31,6 @@ def verify_contents(subject, title, expected_lines) c.before :each do Puppet.settings[:strict_variables] = true if ENV['STRICT_VARIABLES'] == 'yes' - Puppet.settings[:parser] = 'future' if ENV['FUTURE_PARSER'] == 'yes' Puppet.settings[:stringify_facts] = false if ENV['STRINGIFY_FACTS'] == 'no' Puppet.settings[:trusted_node_data] = true if ENV['TRUSTED_NODE_DATA'] == 'yes' Puppet.settings[:ordering] = ENV['ORDERING'] if ENV['ORDERING']