X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fensure_resource_spec.rb;h=9bbfaccf8fec4777bf9feb7e8adfa90c99533275;hb=7c041353f4da829d409830eba2e95946952e817f;hp=33bcac0d1f96ce1e2f7ef1138a7e51a25920baa6;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/ensure_resource_spec.rb b/3rdparty/modules/stdlib/spec/functions/ensure_resource_spec.rb
old mode 100755
new mode 100644
index 33bcac0d1..9bbfaccf8
--- a/3rdparty/modules/stdlib/spec/functions/ensure_resource_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/ensure_resource_spec.rb
@@ -1,113 +1,149 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
 
 describe 'ensure_resource' do
-  include PuppetSpec::Compiler
-
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:ensure_packages)
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(ArgumentError, %r{Must specify a type}) }
+  it { is_expected.to run.with_params('type').and_raise_error(ArgumentError, %r{Must specify a title}) }
+  if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0
+    it { is_expected.to run.with_params('type', 'title', {}, 'extras').and_raise_error(ArgumentError) }
+  else
+    it { is_expected.to run.with_params('type', 'title', {}, 'extras').and_raise_error(Puppet::ParseError) }
   end
 
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  let :scope    do Puppet::Parser::Scope.new(compiler) end
+  it {
+    pending('should not accept numbers as arguments')
+    is_expected.to run.with_params(1, 2, 3).and_raise_error(Puppet::ParseError)
+  }
 
-  describe 'when a type or title is not specified' do
-    it { expect { scope.function_ensure_resource([]) }.to raise_error }
-    it { expect { scope.function_ensure_resource(['type']) }.to raise_error }
-  end
+  context 'when given an empty catalog' do
+    describe 'after running ensure_resource("user", "username1", {})' do
+      before(:each) { subject.execute('User', 'username1', {}) }
 
-  describe 'when compared against a resource with no attributes' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { "dan": }
-        ensure_resource('user', 'dan', {})
-      EOS
-      )
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').without_ensure }
     end
 
-    it 'should contain the the ensured resources' do
-      expect(catalog.resource(:user, 'dan').to_s).to eq('User[dan]')
+    describe 'after running ensure_resource("user", "username1", { gid => undef })' do
+      before(:each) { subject.execute('User', 'username1', 'gid' => undef_value) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').without_ensure }
+      it { expect(-> { catalogue }).to contain_user('username1').without_gid }
     end
-  end
 
-  describe 'works when compared against a resource with non-conflicting attributes' do
-    [
-      "ensure_resource('User', 'dan', {})",
-      "ensure_resource('User', 'dan', '')",
-      "ensure_resource('User', 'dan', {'ensure' => 'present'})",
-      "ensure_resource('User', 'dan', {'ensure' => 'present', 'managehome' => false})"
-    ].each do |ensure_resource|
-      pp = <<-EOS
-        user { "dan": ensure => present, shell => "/bin/csh", managehome => false}
-        #{ensure_resource}
-      EOS
+    describe 'after running ensure_resource("user", "username1", { ensure => present, gid => undef })' do
+      before(:each) { subject.execute('User', 'username1', 'ensure' => 'present', 'gid' => undef_value) }
 
-      it { expect { compile_to_catalog(pp) }.to_not raise_error }
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').with_ensure('present') }
+      it { expect(-> { catalogue }).to contain_user('username1').without_gid }
     end
-  end
 
-  describe 'fails when compared against a resource with conflicting attributes' do
-    pp = <<-EOS
-      user { "dan": ensure => present, shell => "/bin/csh", managehome => false}
-      ensure_resource('User', 'dan', {'ensure' => 'absent', 'managehome' => false})
-    EOS
+    describe 'after running ensure_resource("test::deftype", "foo", {})' do
+      let(:pre_condition) { 'define test::deftype { }' }
+
+      before(:each) { subject.execute('test::deftype', 'foo', {}) }
 
-    it { expect { compile_to_catalog(pp) }.to raise_error }
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_test__deftype('foo').without_ensure }
+    end
   end
 
-  describe 'when an array of new resources are passed in' do
-    let :catalog do
-      compile_to_catalog("ensure_resource('User', ['dan', 'alex'], {})")
+  context 'when given a catalog with UTF8 chars' do
+    describe 'after running ensure_resource("user", "Şắოрŀễ Ţëם", {})' do
+      before(:each) { subject.execute('User', 'Şắოрŀễ Ţëם', {}) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('Şắოрŀễ Ţëם').without_ensure }
     end
 
-    it 'should contain the ensured resources' do
-      expect(catalog.resource('User[dan]').to_s).to eq('User[dan]')
-      expect(catalog.resource('User[alex]').to_s).to eq('User[alex]')
+    describe 'after running ensure_resource("user", "Şắოрŀễ Ţëם", { gid => undef })' do
+      before(:each) { subject.execute('User', 'Şắოрŀễ Ţëם', 'gid' => undef_value) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('Şắოрŀễ Ţëם').without_ensure }
+      it { expect(-> { catalogue }).to contain_user('Şắოрŀễ Ţëם').without_gid }
+    end
+
+    describe 'after running ensure_resource("user", "Şắოрŀễ Ţëם", { ensure => present, gid => undef })' do
+      before(:each) { subject.execute('User', 'Şắოрŀễ Ţëם', 'ensure' => 'present', 'gid' => undef_value) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('Şắოрŀễ Ţëם').with_ensure('present') }
+      it { expect(-> { catalogue }).to contain_user('Şắოрŀễ Ţëם').without_gid }
     end
   end
 
-  describe 'when an array of existing resources is compared against existing resources' do
-    pp = <<-EOS
-      user { 'dan': ensure => present; 'alex': ensure => present }
-      ensure_resource('User', ['dan', 'alex'], {})
-    EOS
+  context 'when given a catalog with "user { username1: ensure => present }"' do
+    let(:pre_condition) { 'user { username1: ensure => present }' }
 
-    let :catalog do
-      compile_to_catalog(pp)
+    describe 'after running ensure_resource("user", "username1", {})' do
+      before(:each) { subject.execute('User', 'username1', {}) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').with_ensure('present') }
     end
 
-    it 'should return the existing resources' do
-      expect(catalog.resource('User[dan]').to_s).to eq('User[dan]')
-      expect(catalog.resource('User[alex]').to_s).to eq('User[alex]')
+    describe 'after running ensure_resource("user", "username2", {})' do
+      before(:each) { subject.execute('User', 'username2', {}) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').with_ensure('present') }
+      it { expect(-> { catalogue }).to contain_user('username2').without_ensure }
     end
-  end
 
-  describe 'works when compared against existing resources with attributes' do
-    [
-      "ensure_resource('User', ['dan', 'alex'], {})",
-      "ensure_resource('User', ['dan', 'alex'], '')",
-      "ensure_resource('User', ['dan', 'alex'], {'ensure' => 'present'})",
-    ].each do |ensure_resource|
-      pp = <<-EOS
-        user { 'dan': ensure => present; 'alex': ensure => present }
-        #{ensure_resource}
-      EOS
+    describe 'after running ensure_resource("user", "username1", { gid => undef })' do
+      before(:each) { subject.execute('User', 'username1', 'gid' => undef_value) }
 
-      it { expect { compile_to_catalog(pp) }.to_not raise_error }
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').with_ensure('present') }
+    end
+
+    describe 'after running ensure_resource("user", ["username1", "username2"], {})' do
+      before(:each) { subject.execute('User', ['username1', 'username2'], {}) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').with_ensure('present') }
+      it { expect(-> { catalogue }).to contain_user('username2').without_ensure }
+    end
+
+    describe 'when providing already set params' do
+      let(:params) { { 'ensure' => 'present' } }
+
+      before(:each) { subject.execute('User', ['username2', 'username3'], params) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_user('username1').with(params) }
+      it { expect(-> { catalogue }).to contain_user('username2').with(params) }
+    end
+
+    context 'when trying to add params' do
+      it {
+        is_expected.to run \
+          .with_params('User', 'username1', 'ensure' => 'present', 'shell' => true) \
+          .and_raise_error(Puppet::Resource::Catalog::DuplicateResourceError, %r{User\[username1\] is already declared})
+      }
     end
   end
 
-  describe 'fails when compared against existing resources with conflicting attributes' do
-    pp = <<-EOS
-      user { 'dan': ensure => present; 'alex': ensure => present }
-      ensure_resource('User', ['dan', 'alex'], {'ensure' => 'absent'})
-    EOS
+  context 'when given a catalog with "test::deftype { foo: }"' do
+    let(:pre_condition) { 'define test::deftype { } test::deftype { "foo": }' }
 
-    it { expect { compile_to_catalog(pp) }.to raise_error }
+    describe 'after running ensure_resource("test::deftype", "foo", {})' do
+      before(:each) { subject.execute('test::deftype', 'foo', {}) }
+
+      # this lambda is required due to strangeness within rspec-puppet's expectation handling
+      it { expect(-> { catalogue }).to contain_test__deftype('foo').without_ensure }
+    end
   end
 
+  if Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0
+    def undef_value
+      :undef
+    end
+  else
+    def undef_value
+      nil
+    end
+  end
 end