rtyler
/
rspec-puppet
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Merge pull request #21 from nanliu/tb/config 

Add Puppet[:config] as a supported option.
This commit is contained in:
Tim Sharpe 2012-03-12 16:17:12 -07:00
parent 4300f25d22 cbc3a77949
commit f95f81190b
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rspec-puppet.rb
View File

@ -9,4 +9,5 @@ RSpec.configure do |c|
c.add_setting :manifest_dir, :default => nil
c.add_setting :manifest, :default => nil
c.add_setting :template_dir, :default => nil
c.add_setting :config, :default => nil
end

1
lib/rspec-puppet/example/class_example_group.rb
View File

@ -12,6 +12,7 @@ module RSpec::Puppet
Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
klass_name = self.class.top_level_description.downcase

1
lib/rspec-puppet/example/define_example_group.rb
View File

@ -14,6 +14,7 @@ module RSpec::Puppet
Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
# If we're testing a standalone module (i.e. one that's outside of a
# puppet tree), the autoloader won't work, so we need to fudge it a bit.

1
lib/rspec-puppet/example/host_example_group.rb
View File

@ -12,6 +12,7 @@ module RSpec::Puppet
Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
Puppet[:code] = ""
nodename = self.class.top_level_description.downcase