summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-08-20 14:04:15 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-08-20 14:04:15 -0700
commit0f45feb31b0100c8f56ad9fff4542296cf51478f (patch)
tree8a737533940ddd4c6ea9ac4170a9e2f58ffa2709
parent46daf0fb6db19287c5021c1d065f462da237920c (diff)
parent607cb542751b41ea608623ec13e0a6ef72b31cd3 (diff)
Merge branch '2.3.x' into 2.4.x
* 2.3.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
-rw-r--r--.rspec4
-rw-r--r--spec/unit/puppet/parser/functions/merge_spec.rb1
2 files changed, 4 insertions, 1 deletions
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..7ab5f55
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,4 @@
+--color
+--format
+progress
+--backtrace
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