diff options
| author | Colleen Murphy <cmurphy@users.noreply.github.com> | 2014-10-28 15:30:17 -0700 |
|---|---|---|
| committer | Colleen Murphy <cmurphy@users.noreply.github.com> | 2014-10-28 15:30:17 -0700 |
| commit | cfc79e9831fb530b4a34bb79db119969b3a166b3 (patch) | |
| tree | c955c144ec2386607f2ad7ac69edb1bcf44df320 /spec/acceptance/merge_spec.rb | |
| parent | 759cbdec886bebb859d8def9323c139faf99c024 (diff) | |
| parent | 51f1d574d92cf686ac79e57e69d8aff31caf2925 (diff) | |
| download | puppet-stdlib-cfc79e9831fb530b4a34bb79db119969b3a166b3.tar.gz puppet-stdlib-cfc79e9831fb530b4a34bb79db119969b3a166b3.tar.bz2 | |
Merge pull request #344 from cyberious/TestCaseFixes
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-x | spec/acceptance/merge_spec.rb | 4 |
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 |