summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-12-20 15:04:18 -0800
committerAdrien Thebo <git@somethingsinistral.net>2013-12-20 15:04:18 -0800
commitb50385b623bbab1dcd2a6660530c3550a3bbdfbe (patch)
treef8ae661057388c4602b8c1c3446fda923dcbb441
parent799e968f5c8ba901a8b395cff6f8848caf8b00e9 (diff)
parent7085472e69569abf67862dfdd4263e8754afb89b (diff)
downloadpuppet-stdlib-b50385b623bbab1dcd2a6660530c3550a3bbdfbe.tar.gz
puppet-stdlib-b50385b623bbab1dcd2a6660530c3550a3bbdfbe.tar.bz2
Merge branch 'pull-209'
This closes GH-209
-rw-r--r--lib/puppet/parser/functions/prefix.rb2
-rw-r--r--spec/unit/puppet/parser/functions/prefix_spec.rb19
-rw-r--r--spec/unit/puppet/parser/functions/suffix_spec.rb18
3 files changed, 28 insertions, 11 deletions
diff --git a/lib/puppet/parser/functions/prefix.rb b/lib/puppet/parser/functions/prefix.rb
index 62211ae..d02286a 100644
--- a/lib/puppet/parser/functions/prefix.rb
+++ b/lib/puppet/parser/functions/prefix.rb
@@ -28,7 +28,7 @@ Will return: ['pa','pb','pc']
if prefix
unless prefix.is_a?(String)
- raise Puppet::ParseError, "prefix(): expected second argument to be a String, got #{suffix.inspect}"
+ raise Puppet::ParseError, "prefix(): expected second argument to be a String, got #{prefix.inspect}"
end
end
diff --git a/spec/unit/puppet/parser/functions/prefix_spec.rb b/spec/unit/puppet/parser/functions/prefix_spec.rb
index 5cf592b..6e8ddc5 100644
--- a/spec/unit/puppet/parser/functions/prefix_spec.rb
+++ b/spec/unit/puppet/parser/functions/prefix_spec.rb
@@ -4,15 +4,24 @@ require 'spec_helper'
describe "the prefix function" do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
- it "should exist" do
- Puppet::Parser::Functions.function("prefix").should == "function_prefix"
+ it "raises a ParseError if there is less than 1 arguments" do
+ expect { scope.function_prefix([]) }.to raise_error(Puppet::ParseError, /number of arguments/)
end
- it "should raise a ParseError if there is less than 1 arguments" do
- lambda { scope.function_prefix([]) }.should( raise_error(Puppet::ParseError))
+ it "raises an error if the first argument is not an array" do
+ expect {
+ scope.function_prefix([Object.new])
+ }.to raise_error(Puppet::ParseError, /expected first argument to be an Array/)
end
- it "should return a prefixed array" do
+
+ it "raises an error if the second argument is not a string" do
+ expect {
+ scope.function_prefix([['first', 'second'], 42])
+ }.to raise_error(Puppet::ParseError, /expected second argument to be a String/)
+ end
+
+ it "returns a prefixed array" do
result = scope.function_prefix([['a','b','c'], 'p'])
result.should(eq(['pa','pb','pc']))
end
diff --git a/spec/unit/puppet/parser/functions/suffix_spec.rb b/spec/unit/puppet/parser/functions/suffix_spec.rb
index c28f719..89ba3b8 100644
--- a/spec/unit/puppet/parser/functions/suffix_spec.rb
+++ b/spec/unit/puppet/parser/functions/suffix_spec.rb
@@ -4,15 +4,23 @@ require 'spec_helper'
describe "the suffix function" do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
- it "should exist" do
- Puppet::Parser::Functions.function("suffix").should == "function_suffix"
+ it "raises a ParseError if there is less than 1 arguments" do
+ expect { scope.function_suffix([]) }.to raise_error(Puppet::ParseError, /number of arguments/)
end
- it "should raise a ParseError if there is less than 1 arguments" do
- lambda { scope.function_suffix([]) }.should( raise_error(Puppet::ParseError))
+ it "raises an error if the first argument is not an array" do
+ expect {
+ scope.function_suffix([Object.new])
+ }.to raise_error(Puppet::ParseError, /expected first argument to be an Array/)
end
- it "should return a suffixed array" do
+ it "raises an error if the second argument is not a string" do
+ expect {
+ scope.function_suffix([['first', 'second'], 42])
+ }.to raise_error(Puppet::ParseError, /expected second argument to be a String/)
+ end
+
+ it "returns a suffixed array" do
result = scope.function_suffix([['a','b','c'], 'p'])
result.should(eq(['ap','bp','cp']))
end