diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/classes/rsyslog_client_spec.rb | 1 | ||||
| -rw-r--r-- | spec/classes/rsyslog_database_spec.rb | 1 | ||||
| -rw-r--r-- | spec/classes/rsyslog_server_spec.rb | 1 | ||||
| -rw-r--r-- | spec/classes/rsyslog_spec.rb | 4 | ||||
| -rw-r--r-- | spec/defines/rsyslog_imfile_spec.rb | 1 | ||||
| -rw-r--r-- | spec/defines/rsyslog_snippet_spec.rb | 1 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 27 |
7 files changed, 36 insertions, 0 deletions
diff --git a/spec/classes/rsyslog_client_spec.rb b/spec/classes/rsyslog_client_spec.rb index ecf5911..ec66a90 100644 --- a/spec/classes/rsyslog_client_spec.rb +++ b/spec/classes/rsyslog_client_spec.rb @@ -5,6 +5,7 @@ describe 'rsyslog::client', :type => :class do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end diff --git a/spec/classes/rsyslog_database_spec.rb b/spec/classes/rsyslog_database_spec.rb index cbbaa3a..a704d2d 100644 --- a/spec/classes/rsyslog_database_spec.rb +++ b/spec/classes/rsyslog_database_spec.rb @@ -5,6 +5,7 @@ describe 'rsyslog::database', :type => :class do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end diff --git a/spec/classes/rsyslog_server_spec.rb b/spec/classes/rsyslog_server_spec.rb index 677a8f4..b46eeaa 100644 --- a/spec/classes/rsyslog_server_spec.rb +++ b/spec/classes/rsyslog_server_spec.rb @@ -7,6 +7,7 @@ describe 'rsyslog::server', :type => :class do let :facts do { :osfamily => osfamily, + :operatingsystem => osfamily, :operatingsystemrelease => 6.0, } end diff --git a/spec/classes/rsyslog_spec.rb b/spec/classes/rsyslog_spec.rb index 5a06816..08f4761 100644 --- a/spec/classes/rsyslog_spec.rb +++ b/spec/classes/rsyslog_spec.rb @@ -5,6 +5,7 @@ describe 'rsyslog', :type => :class do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end @@ -60,6 +61,7 @@ describe 'rsyslog', :type => :class do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end @@ -112,6 +114,7 @@ describe 'rsyslog', :type => :class do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end @@ -164,6 +167,7 @@ describe 'rsyslog', :type => :class do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end diff --git a/spec/defines/rsyslog_imfile_spec.rb b/spec/defines/rsyslog_imfile_spec.rb index ad311e3..ddc351d 100644 --- a/spec/defines/rsyslog_imfile_spec.rb +++ b/spec/defines/rsyslog_imfile_spec.rb @@ -5,6 +5,7 @@ describe 'rsyslog::imfile', :type => :define do let :facts do { :osfamily => 'RedHat', + :operatingsystem => 'RedHat', :operatingsystemrelease => 6.0, } end diff --git a/spec/defines/rsyslog_snippet_spec.rb b/spec/defines/rsyslog_snippet_spec.rb index 4f3d5b8..c034155 100644 --- a/spec/defines/rsyslog_snippet_spec.rb +++ b/spec/defines/rsyslog_snippet_spec.rb @@ -5,6 +5,7 @@ describe 'rsyslog::snippet', :type => :define do let :facts do
{
:osfamily => 'RedHat',
+ :operatingsystem => 'Redhat',
:operatingsystemrelease => 6.0,
}
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2c6f566..a05654b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1 +1,28 @@ require 'puppetlabs_spec_helper/module_spec_helper' + +RSpec.configure do |c| + c.mock_with :rspec do |mock| + mock.syntax = [:expect, :should] + end + c.include PuppetlabsSpec::Files + + c.before :each do + # Ensure that we don't accidentally cache facts and environment + # between test cases. + Facter::Util::Loader.any_instance.stubs(:load_all) + Facter.clear + Facter.clear_messages + + # Store any environment variables away to be restored later + @old_env = {} + ENV.each_key {|k| @old_env[k] = ENV[k]} + + if ENV['STRICT_VARIABLES'] == 'yes' + Puppet.settings[:strict_variables]=true + end + end + + c.after :each do + PuppetlabsSpec::Files.cleanup + end +end |