CB-13496: Fix greedy regex in plist-helpers #45
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
Codecov Report
@@ Coverage Diff @@
## master #45 +/- ##
=======================================
Coverage 86.24% 86.24%
=======================================
Files 19 19
Lines 1730 1730
Branches 360 360
=======================================
Hits 1492 1492
Misses 238 238
Continue to review full report at Codecov.
|
|
#44 says that their problem is related to the same JIRA ticket |
knight9999
approved these changes
Sep 6, 2018
|
@dpogue / @knight9999 - thanks for getting this PR through so quickly! |
janpio
moved this from 🐣 New PR / Untriaged
to ⏳ Waiting for Review
in Apache Cordova: Tooling Pull Requests
janpio
moved this from ⏳ Waiting for Review
to ✅ Approved, waiting for Merge
in Apache Cordova: Tooling Pull Requests
Apache Cordova: Tooling Pull Requests
automation
moved this from ✅ Approved, waiting for Merge
to 🏆 Merged, waiting for Release
Sep 11, 2018
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.
Platforms affected
iOS
What does this PR do?
Resolves an issue where a regex was overly greedy when comparing plist entries for merging and could result in collapsing several of them into a single entry.
What testing has been done on this change?
Added a test that fails with current master and passes with this change, based on the details provided by @knight9999 in the JIRA bug. It sounds like this might be the cause of GH-44 as well (/fyi @donnie-jp).
Now, my fix assumes that we're always looking for
$(something)and not just$something, which might not be a safe assumption. Unfortunately I'm not well-versed enough in iOS stuff to know :(Checklist