X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fjoin_keys_to_values_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fjoin_keys_to_values_spec.rb;h=97674ef9eccf9dd1b273547c80864ab6d4753e58;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=0a2a50ccb89f7fb6da583988ec1603bc88396958;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/join_keys_to_values_spec.rb b/3rdparty/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
old mode 100755
new mode 100644
index 0a2a50ccb..97674ef9e
--- a/3rdparty/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
@@ -2,29 +2,33 @@ require 'spec_helper'
 
 describe 'join_keys_to_values' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /Takes exactly two arguments/) }
-  it { is_expected.to run.with_params({}, '', '').and_raise_error(Puppet::ParseError, /Takes exactly two arguments/) }
-  it { is_expected.to run.with_params('one', '').and_raise_error(TypeError, /The first argument must be a hash/) }
-  it { is_expected.to run.with_params({}, 2).and_raise_error(TypeError, /The second argument must be a string/) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Takes exactly two arguments}) }
+  it { is_expected.to run.with_params({}, '', '').and_raise_error(Puppet::ParseError, %r{Takes exactly two arguments}) }
+  it { is_expected.to run.with_params('one', '').and_raise_error(TypeError, %r{The first argument must be a hash}) }
+  it { is_expected.to run.with_params({}, 2).and_raise_error(TypeError, %r{The second argument must be a string}) }
 
   it { is_expected.to run.with_params({}, '').and_return([]) }
   it { is_expected.to run.with_params({}, ':').and_return([]) }
   it { is_expected.to run.with_params({ 'key' => 'value' }, '').and_return(['keyvalue']) }
   it { is_expected.to run.with_params({ 'key' => 'value' }, ':').and_return(['key:value']) }
 
-  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({ 'ҝẽγ' => '√ạĺűē' }, ':').and_return(['ҝẽγ:√ạĺűē']) }
-    it  { is_expected.to run.with_params({ 'ҝẽγ' => '√ạĺűē' }, '万').and_return(['ҝẽγ万√ạĺűē']) }
+    it { is_expected.to run.with_params({ 'ҝẽγ' => '√ạĺűē' }, '万').and_return(['ҝẽγ万√ạĺűē']) }
   end
 
-  it { is_expected.to run.with_params({ 'key' => nil }, ':').and_return(['key:']) }
-  it 'should run join_keys_to_values(<hash with multiple keys>, ":") and return the proper array' do
-    result = subject.call([{ 'key1' => 'value1', 'key2' => 'value2' }, ':'])
-    expect(result.sort).to eq(['key1:value1', 'key2:value2'].sort)
+  if Puppet::Util::Package.versioncmp(Puppet.version, '5.5.7') == 0
+    it { is_expected.to run.with_params({ 'key' => '' }, ':').and_return(['key:']) }
+  else
+    it { is_expected.to run.with_params({ 'key' => nil }, ':').and_return(['key:']) }
   end
-  it 'should run join_keys_to_values(<hash with array value>, " ") and return the proper array' do
-    result = subject.call([{ 'key1' => 'value1', 'key2' => ['value2', 'value3'] }, ' '])
-    expect(result.sort).to eq(['key1 value1', 'key2 value2', 'key2 value3'].sort)
+
+  it 'runs join_keys_to_values(<hash with multiple keys>, ":") and return the proper array' do
+    is_expected.to run.with_params({ 'key1' => 'value1', 'key2' => 'value2' }, ':').and_return(['key1:value1', 'key2:value2'])
   end
-end
 
+  it 'runs join_keys_to_values(<hash with array value>, " ") and return the proper array' do
+    expected_result = ['key1 value1', 'key2 value2', 'key2 value3']
+    is_expected.to run.with_params({ 'key1' => 'value1', 'key2' => ['value2', 'value3'] }, ' ').and_return(expected_result)
+  end
+end