X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fdefined_with_params_spec.rb;h=74f9a7cccd3fed68908b957b1debd5eb2c0ce8ee;hb=59812388abf4638d6065ffda934d1866af902302;hp=491a03be70d919efffbf88a24f69c97ea0f67d89;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/defined_with_params_spec.rb b/3rdparty/modules/stdlib/spec/functions/defined_with_params_spec.rb
old mode 100755
new mode 100644
index 491a03be7..74f9a7ccc
--- a/3rdparty/modules/stdlib/spec/functions/defined_with_params_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/defined_with_params_spec.rb
@@ -2,17 +2,18 @@ require 'spec_helper'
 
 describe 'defined_with_params' do
   describe 'when no resource is specified' do
-    it { is_expected.to run.with_params().and_raise_error(ArgumentError) }
+    it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   end
   describe 'when compared against a resource with no attributes' do
     let :pre_condition do
       'user { "dan": }'
     end
+
     it { is_expected.to run.with_params('User[dan]', {}).and_return(true) }
     it { is_expected.to run.with_params('User[bob]', {}).and_return(false) }
-    it { is_expected.to run.with_params('User[dan]', {'foo' => 'bar'}).and_return(false) }
+    it { is_expected.to run.with_params('User[dan]', 'foo' => 'bar').and_return(false) }
 
-    context 'should run with UTF8 and double byte characters' do
+    context 'with UTF8 and double byte characters' do
       it { is_expected.to run.with_params('User[ĵĭмოү]', {}).and_return(false) }
       it { is_expected.to run.with_params('User[ポーラ]', {}).and_return(false) }
     end
@@ -22,35 +23,39 @@ describe 'defined_with_params' do
     let :pre_condition do
       'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}'
     end
+
     it { is_expected.to run.with_params('User[dan]', {}).and_return(true) }
     it { is_expected.to run.with_params('User[dan]', '').and_return(true) }
-    it { is_expected.to run.with_params('User[dan]', {'ensure' => 'present'}).and_return(true) }
-    it { is_expected.to run.with_params('User[dan]', {'ensure' => 'present', 'managehome' => false}).and_return(true) }
-    it { is_expected.to run.with_params('User[dan]', {'ensure' => 'absent', 'managehome' => false}).and_return(false) }
+    it { is_expected.to run.with_params('User[dan]', 'ensure' => 'present').and_return(true) }
+    it { is_expected.to run.with_params('User[dan]', 'ensure' => 'present', 'managehome' => false).and_return(true) }
+    it { is_expected.to run.with_params('User[dan]', 'ensure' => 'absent', 'managehome' => false).and_return(false) }
   end
 
   describe 'when passing undef values' do
     let :pre_condition do
       'file { "/tmp/a": ensure => present }'
     end
+    let(:is_puppet_6_or_greater) { Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') >= 0 }
+    let(:undef_value) { is_puppet_6_or_greater ? nil : :undef } # even if :undef would work on 6.0.1, :undef should not be used
 
     it { is_expected.to run.with_params('File[/tmp/a]', {}).and_return(true) }
-    it { is_expected.to run.with_params('File[/tmp/a]', { 'ensure' => 'present', 'owner' => :undef }).and_return(true) }
+    it { is_expected.to run.with_params('File[/tmp/a]', 'ensure' => 'present', 'owner' => undef_value).and_return(true) }
   end
 
   describe 'when the reference is a' do
     let :pre_condition do
       'user { "dan": }'
     end
-    context 'reference' do
+
+    context 'with reference' do
       it { is_expected.to run.with_params(Puppet::Resource.new('User[dan]'), {}).and_return(true) }
     end
     if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0
-      context 'array' do
+      context 'with array' do
         it 'fails' do
           expect {
-            subject.call([['User[dan]'], {}])
-          }.to raise_error ArgumentError, /not understood: 'Array'/
+            subject.execute(['User[dan]'], {})
+          }.to raise_error(ArgumentError, %r{not understood: 'Array'})
         end
       end
     end
@@ -58,11 +63,25 @@ describe 'defined_with_params' do
 
   describe 'when passed a defined type' do
     let :pre_condition do
-      'test::deftype { "foo": }'
+      'define test::deftype() { } test::deftype { "foo": }'
     end
+
     it { is_expected.to run.with_params('Test::Deftype[foo]', {}).and_return(true) }
     it { is_expected.to run.with_params('Test::Deftype[bar]', {}).and_return(false) }
     it { is_expected.to run.with_params(Puppet::Resource.new('Test::Deftype[foo]'), {}).and_return(true) }
     it { is_expected.to run.with_params(Puppet::Resource.new('Test::Deftype[bar]'), {}).and_return(false) }
   end
+
+  describe 'when passed a class' do
+    let :pre_condition do
+      'class test () { } class { "test": }'
+    end
+
+    it { is_expected.to run.with_params('Class[test]', {}).and_return(true) }
+    it { is_expected.to run.with_params('Class["bar"]', {}).and_return(false) }
+    it { is_expected.to run.with_params('Class[bar]', {}).and_return(false) }
+    it { is_expected.to run.with_params(Puppet::Resource.new('class', 'test'), {}).and_return(true) }
+    it { is_expected.to run.with_params(Puppet::Resource.new('Class["bar"]'), {}).and_return(false) }
+    it { is_expected.to run.with_params(Puppet::Resource.new('Class[bar]'), {}).and_return(false) }
+  end
 end