summaryrefslogtreecommitdiff
path: root/spec/unit/puppet
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-08-20 14:04:03 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-08-20 14:04:03 -0700
commit607cb542751b41ea608623ec13e0a6ef72b31cd3 (patch)
tree0825cc3d9c2481cac7a0681b62dd7b6448450a89 /spec/unit/puppet
parentb93a38c005546f8ed0086ca9473615648e2fcba8 (diff)
parenta8a4f93992d88bdee91f2c338b9338f1c530789a (diff)
Merge branch '2.2.x' into 2.3.x
* 2.2.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
Diffstat (limited to 'spec/unit/puppet')
-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