Update puppetlabs/stdlib module

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

diff --git a/3rdparty/modules/stdlib/spec/functions/merge_spec.rb b/3rdparty/modules/stdlib/spec/functions/merge_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 3b2e3ef..25e2658
--- a/3rdparty/modules/stdlib/spec/functions/merge_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/merge_spec.rb
@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'merge' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params({}, 'two').and_raise_error(Puppet::ParseError, /unexpected argument type String/) }
-  it { is_expected.to run.with_params({}, 1).and_raise_error(Puppet::ParseError, /unexpected argument type (Fixnum|Integer)/) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+  it { is_expected.to run.with_params({}, 'two').and_raise_error(Puppet::ParseError, %r{unexpected argument type String}) }
+  it { is_expected.to run.with_params({}, 1).and_raise_error(Puppet::ParseError, %r{unexpected argument type (Fixnum|Integer)}) }
   it {
     pending 'should not special case this'
     is_expected.to run.with_params({}).and_return({})
@@ -14,12 +14,12 @@ describe 'merge' do
   describe 'should accept empty strings as puppet undef' do
     it { is_expected.to run.with_params({}, '').and_return({}) }
   end
-  it { is_expected.to run.with_params({ 'key' => 'value' }, {}).and_return({ 'key' => 'value' }) }
-  it { is_expected.to run.with_params({}, { 'key' => 'value' }).and_return({ 'key' => 'value' }) }
-  it { is_expected.to run.with_params({ 'key' => 'value1' }, { 'key' => 'value2' }).and_return({ 'key' => 'value2' }) }
+  it { is_expected.to run.with_params({ 'key' => 'value' }, {}).and_return('key' => 'value') }
+  it { is_expected.to run.with_params({}, 'key' => 'value').and_return('key' => 'value') }
+  it { is_expected.to run.with_params({ 'key' => 'value1' }, 'key' => 'value2').and_return('key' => 'value2') }
   it {
     is_expected.to run \
-      .with_params({ 'key1' => 'value1' }, { 'key2' => 'value2' }, { 'key3' => 'value3' }) \
-      .and_return({ 'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3' })
+      .with_params({ 'key1' => 'value1' }, { 'key2' => 'value2' }, 'key3' => 'value3') \
+      .and_return('key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3')
   }
 end