fix: Merge config files on Config.set() #2214
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
|
Thanks. Can you please add a test showing the changed behaviour? |
|
Looks good thanks for this. Can you squash all the commits into one please and make the commit message so it follows our convention then I can merge it thanks :) |
The old behaviour will override child option nodes like options.client, causing properties to be lost if the new option node is only partially specified. This partially causes karma-runner/grunt-karma#165 and karma-runner/grunt-karma#166.
|
Ok I've rolled it into one commit (not including the rebase one). Do I need to include the rebase in there? |
|
Thanks |
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.
The previous implementation overwrote properties so for sub-properties such as Config.client.* they could be overwritten if it's only partially specified.
Works with karma-runner/grunt-karma#194 to solve karma-runner/grunt-karma#165 and other issues mentioned in that PR.