check for nil

redhat-openstack · Jun 22, 2015 · 967880f · 967880f
1 parent f654561
commit 967880f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
@@ -6,15 +6,15 @@
     groupname = 'system'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
   when 'Darwin'
     username = 'root'
     groupname = 'wheel'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
   when 'windows'
@@ -28,15 +28,15 @@
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
   else
     username = 'root'
     groupname = 'root'
     scriptname = 'concatfragments.rb'
     vardir = default['puppetvardir']
-    if vardir == ''
+    if vardir.nil? or vardir == ''
       vardir = '/opt/puppetlabs/puppet/cache'
     end
 end