fix all STRICT_VARIABLES failures

voxpupuli · Aug 15, 2016 · 3408602 · 3408602
1 parent 46cb1bd
commit 3408602
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -14,9 +14,9 @@
 #
 # This class file is not called directly
 class nginx::service(
-  $configtest_enable = $::nginx::configtest_enable,
-  $service_restart   = $::nginx::service_restart,
-  $service_ensure    = $::nginx::service_ensure,
+  $configtest_enable = false,
+  $service_restart   = '/etc/init.d/nginx reload',
+  $service_ensure    = 'running',
   $service_name      = 'nginx',
   $service_flags     = undef,
   $service_manage    = true,

diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -75,9 +75,9 @@
         recurse: true
       )
     end
-    it { is_expected.to contain_file('/var/nginx/client_body_temp').with(owner: 'nginx') }
-    it { is_expected.to contain_file('/var/nginx/proxy_temp').with(owner: 'nginx') }
-    it { is_expected.to contain_file('/etc/nginx/nginx.conf').with_content %r{^user nginx;} }
+    it { is_expected.to contain_file('/var/nginx/client_body_temp').with(owner: 'www-data') }
+    it { is_expected.to contain_file('/var/nginx/proxy_temp').with(owner: 'www-data') }
+    it { is_expected.to contain_file('/etc/nginx/nginx.conf').with_content %r{^user www-data;} }
 
     it do
       is_expected.to contain_file('/var/log/nginx').with(

diff --git a/spec/default_module_facts.yml b/spec/default_module_facts.yml
@@ -0,0 +1,6 @@
+---
+osfamily: "Debian"
+operatingsystem: "Debian"
+operatingsystemmajrelease: "8"
+lsbdistid: "Debian"
+lsbdistcodename: "jessie"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,8 +7,8 @@
     puppetversion: Puppet.version,
     facterversion: Facter.version
   }
-  default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_facts.yml')
-  default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_module_facts.yml')
+  default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
+  default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
   c.default_facts = default_facts
 end