summaryrefslogtreecommitdiff
path: root/spec/acceptance/merge_spec.rb
diff options
context:
space:
mode:
authorTravis Fields <travis@puppetlabs.com>2014-10-28 15:27:24 -0700
committerTravis Fields <travis@puppetlabs.com>2014-10-28 15:27:24 -0700
commit51f1d574d92cf686ac79e57e69d8aff31caf2925 (patch)
treec955c144ec2386607f2ad7ac69edb1bcf44df320 /spec/acceptance/merge_spec.rb
parent759cbdec886bebb859d8def9323c139faf99c024 (diff)
Fix testcases for Future Parser and resolve issue with values_at in assuming that it was dealing with a string
Diffstat (limited to 'spec/acceptance/merge_spec.rb')
-rwxr-xr-xspec/acceptance/merge_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/acceptance/merge_spec.rb b/spec/acceptance/merge_spec.rb
index a60e784..227b994 100755
--- a/spec/acceptance/merge_spec.rb
+++ b/spec/acceptance/merge_spec.rb
@@ -14,9 +14,9 @@ describe 'merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('opera
EOS
apply_manifest(pp, :catch_failures => true) do |r|
- expect(r.stdout).to match(/merge\[one\] is "1"/)
+ expect(r.stdout).to match(/merge\[one\] is ("1"|1)/)
expect(r.stdout).to match(/merge\[two\] is "dos"/)
- expect(r.stdout).to match(/merge\[three\] is {"five"=>"5"}/)
+ expect(r.stdout).to match(/merge\[three\] is {"five"=>("5"|5)}/)
end
end
end