X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fconcat_spec.rb;h=9290d407cb0cd9e4423ddedba293780acaeeedc7;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=6ab1b6e1d8f62b6303e22c7763c56d04c19663df;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/concat_spec.rb b/3rdparty/modules/stdlib/spec/functions/concat_spec.rb
old mode 100755
new mode 100644
index 6ab1b6e1d..9290d407c
--- a/3rdparty/modules/stdlib/spec/functions/concat_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/concat_spec.rb
@@ -2,28 +2,27 @@ require 'spec_helper'
 
 describe 'concat' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params([1]).and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params(1, [2]).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Wrong number of arguments}) }
+  it { is_expected.to run.with_params([1]).and_raise_error(Puppet::ParseError, %r{Wrong number of arguments}) }
+  it { is_expected.to run.with_params(1, [2]).and_raise_error(Puppet::ParseError, %r{Requires array}) }
   it { is_expected.to run.with_params([1], [2], [3]).and_return([1, 2, 3]) }
-  it { is_expected.to run.with_params(['1','2','3'],['4','5','6']).and_return(['1','2','3','4','5','6']) }
-  it { is_expected.to run.with_params(['1','2','3'],'4').and_return(['1','2','3','4']) }
-  it { is_expected.to run.with_params(['1','2','3'],[['4','5'],'6']).and_return(['1','2','3',['4','5'],'6']) }
-  it { is_expected.to run.with_params(['1','2'],['3','4'],['5','6']).and_return(['1','2','3','4','5','6']) }
-  it { is_expected.to run.with_params(['1','2'],'3','4',['5','6']).and_return(['1','2','3','4','5','6']) }
+  it { is_expected.to run.with_params(['1', '2', '3'], ['4', '5', '6']).and_return(['1', '2', '3', '4', '5', '6']) }
+  it { is_expected.to run.with_params(['1', '2', '3'], '4').and_return(['1', '2', '3', '4']) }
+  it { is_expected.to run.with_params(['1', '2', '3'], [['4', '5'], '6']).and_return(['1', '2', '3', ['4', '5'], '6']) }
+  it { is_expected.to run.with_params(['1', '2'], ['3', '4'], ['5', '6']).and_return(['1', '2', '3', '4', '5', '6']) }
+  it { is_expected.to run.with_params(['1', '2'], '3', '4', ['5', '6']).and_return(['1', '2', '3', '4', '5', '6']) }
 
-context 'should run with UTF8 and double byte characters' do
-  it { is_expected.to run.with_params([{"a" => "b"}], {"c" => "d", "e" => "f"}).and_return([{"a" => "b"}, {"c" => "d", "e" => "f"}]) }
-  it { is_expected.to run.with_params(['ấ','β','©'],['đ','ể','文字列']).and_return(['ấ','β','©','đ','ể','文字列']) }
-end
+  context 'with UTF8 and double byte characters' do
+    it { is_expected.to run.with_params([{ 'a' => 'b' }], 'c' => 'd', 'e' => 'f').and_return([{ 'a' => 'b' }, { 'c' => 'd', 'e' => 'f' }]) }
+    it { is_expected.to run.with_params(['ấ', 'β', '©'], ['đ', 'ể', '文字列']).and_return(['ấ', 'β', '©', 'đ', 'ể', '文字列']) }
+  end
 
-  it "should leave the original array intact" do
-    argument1 = ['1','2','3']
-    original1 = argument1.dup
-    argument2 = ['4','5','6']
-    original2 = argument2.dup
-    result = subject.call([argument1,argument2])
-    expect(argument1).to eq(original1)
-    expect(argument2).to eq(original2)
+  arguments = [['1', '2', '3'], ['4', '5', '6']]
+  originals = [arguments[0].dup, arguments[1].dup]
+  it 'leaves the original array intact' do
+    _result = subject.execute(arguments[0], arguments[1])
+    arguments.each_with_index do |argument, index|
+      expect(argument).to eq(originals[index])
+    end
   end
 end