summaryrefslogtreecommitdiff
path: root/spec/unit
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-08-20 14:03:48 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-08-20 14:03:48 -0700
commita8a4f93992d88bdee91f2c338b9338f1c530789a (patch)
treeb08d6c0d76dc3a8350f3edcd12c2aeaeac614da1 /spec/unit
parente27eccb3567584d809c20cbf77baffcf99886200 (diff)
parent3f44686f1c0112cc0febaaa8ad844f02d85562cf (diff)
downloadpuppet-stdlib-a8a4f93992d88bdee91f2c338b9338f1c530789a.tar.gz
puppet-stdlib-a8a4f93992d88bdee91f2c338b9338f1c530789a.tar.bz2
Merge branch '2.1.x' into 2.2.x
* 2.1.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb
Diffstat (limited to 'spec/unit')
-rw-r--r--spec/unit/puppet/parser/functions/merge_spec.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb
index 9218b9d..db7d837 100644
--- a/spec/unit/puppet/parser/functions/merge_spec.rb
+++ b/spec/unit/puppet/parser/functions/merge_spec.rb
@@ -26,7 +26,6 @@ describe Puppet::Parser::Functions.function(:merge) do
describe 'when calling merge on the scope instance' do
it 'should require all parameters are hashes' do
expect { new_hash = scope.function_merge([{}, '2'])}.should raise_error(Puppet::ParseError, /unexpected argument type String/)
-
end
it 'should be able to merge two hashes' do