(MODULES-9479) Fix nested array merge behavior #593
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix regression in behavior introduced in the 5.2.0 release with the fix for MODULES-8287. Restore the behavior where arrays nested inside hashes will be merged.
tphoney
reviewed
Jul 17, 2019
spec/acceptance/force_spec.rb
Outdated
| it 'applies the manifest twice with no stderr' do | ||
| idempotent_apply(pp) | ||
| expect(file("#{@basedir}/file")).to be_file | ||
| expect(file("#{@basedir}/file").content).to match '{"one":[1,2]}' || '{"one":[1,2]}\n' |
There was a problem hiding this comment.
could it be expect(file("#{@basedir}/file").content).to match '{"one":[1,2]}\R?' ?
There was a problem hiding this comment.
There was a problem hiding this comment.
what about .to contain '{"one":[1,2]}' we dont specifically care if the new line is there or not,
|
apologies for closing the pr, it was to force kick appveyor |
[martin.ewings@martin puppetlabs-concat]$ bundle exec rake litmus:acceptance:parallel
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix regression in behavior introduced in the 5.2.0 release
with the fix for MODULES-8287. Restore the behavior where arrays
nested inside hashes will be merged.