Update puppetlabs/stdlib module

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / functions / ensure_resources_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/functions/ensure_resources_spec.rb b/3rdparty/modules/stdlib/spec/functions/ensure_resources_spec.rb
index 7cca671..10a27bf 100644 (file)
--- a/3rdparty/modules/stdlib/spec/functions/ensure_resources_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/ensure_resources_spec.rb
@@ -2,24 +2,26 @@ require 'spec_helper'
 
 describe 'ensure_resources' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(ArgumentError, /Must specify a type/) }
-  it { is_expected.to run.with_params('type').and_raise_error(ArgumentError, /Must specify a title/) }
+  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}) }
 
   describe 'given a title hash of multiple resources' do
-    before { subject.call(['user', {'dan' => { 'gid' => 'mygroup', 'uid' => '600' }, 'alex' => { 'gid' => 'mygroup', 'uid' => '700'}}, {'ensure' => 'present'}]) }
+    before(:each) do
+      subject.execute('user', { 'dan' => { 'gid' => 'mygroup', 'uid' => '600' }, 'alex' => { 'gid' => 'mygroup', 'uid' => '700' } }, 'ensure' => 'present')
+    end
 
     # this lambda is required due to strangeness within rspec-puppet's expectation handling
-    it { expect(lambda { catalogue }).to contain_user('dan').with_ensure('present') }
-    it { expect(lambda { catalogue }).to contain_user('alex').with_ensure('present') }
-    it { expect(lambda { catalogue }).to contain_user('dan').with({ 'gid' => 'mygroup', 'uid' => '600'}) }
-    it { expect(lambda { catalogue }).to contain_user('alex').with({ 'gid' => 'mygroup', 'uid' => '700'}) }
+    it { expect(-> { catalogue }).to contain_user('dan').with_ensure('present') }
+    it { expect(-> { catalogue }).to contain_user('alex').with_ensure('present') }
+    it { expect(-> { catalogue }).to contain_user('dan').with('gid' => 'mygroup', 'uid' => '600') }
+    it { expect(-> { catalogue }).to contain_user('alex').with('gid' => 'mygroup', 'uid' => '700') }
   end
 
   describe 'given a title hash of a single resource' do
-    before { subject.call(['user', {'dan' => { 'gid' => 'mygroup', 'uid' => '600' }}, {'ensure' => 'present'}]) }
+    before(:each) { subject.execute('user', { 'dan' => { 'gid' => 'mygroup', 'uid' => '600' } }, 'ensure' => 'present') }
 
     # this lambda is required due to strangeness within rspec-puppet's expectation handling
-    it { expect(lambda { catalogue }).to contain_user('dan').with_ensure('present') }
-    it { expect(lambda { catalogue }).to contain_user('dan').with({ 'gid' => 'mygroup', 'uid' => '600'}) }
+    it { expect(-> { catalogue }).to contain_user('dan').with_ensure('present') }
+    it { expect(-> { catalogue }).to contain_user('dan').with('gid' => 'mygroup', 'uid' => '600') }
   end
 end