summaryrefslogtreecommitdiff
path: root/spec/functions/concat_spec.rb
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-06-19 16:25:16 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-06-19 16:25:16 -0700
commit4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0 (patch)
treefb3b511665dd8b7e4555e4f1c803202932de119e /spec/functions/concat_spec.rb
parent7d4fa05da13577072defe991b9de8b96ac4c3be7 (diff)
parentffe21fc67491c4502114505c82142781d72720ab (diff)
downloadpuppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.gz
puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.bz2
Merge branch 'master' into 4.3.x
Diffstat (limited to 'spec/functions/concat_spec.rb')
-rwxr-xr-xspec/functions/concat_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/functions/concat_spec.rb b/spec/functions/concat_spec.rb
index 6e67620..b853b4c 100755
--- a/spec/functions/concat_spec.rb
+++ b/spec/functions/concat_spec.rb
@@ -5,26 +5,26 @@ describe "the concat function" do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
it "should raise a ParseError if the client does not provide two arguments" do
- lambda { scope.function_concat([]) }.should(raise_error(Puppet::ParseError))
+ expect { scope.function_concat([]) }.to(raise_error(Puppet::ParseError))
end
it "should raise a ParseError if the first parameter is not an array" do
- lambda { scope.function_concat([1, []])}.should(raise_error(Puppet::ParseError))
+ expect { scope.function_concat([1, []])}.to(raise_error(Puppet::ParseError))
end
it "should be able to concat an array" do
result = scope.function_concat([['1','2','3'],['4','5','6']])
- result.should(eq(['1','2','3','4','5','6']))
+ expect(result).to(eq(['1','2','3','4','5','6']))
end
it "should be able to concat a primitive to an array" do
result = scope.function_concat([['1','2','3'],'4'])
- result.should(eq(['1','2','3','4']))
+ expect(result).to(eq(['1','2','3','4']))
end
it "should not accidentally flatten nested arrays" do
result = scope.function_concat([['1','2','3'],[['4','5'],'6']])
- result.should(eq(['1','2','3',['4','5'],'6']))
+ expect(result).to(eq(['1','2','3',['4','5'],'6']))
end
end