CardDAV convertor check should not be to wide #7342
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
rullzer
requested review from
nickvergessen,
MorrisJobke,
LukasReschke,
georgehrke and
schiessle
Case: email is set to null, but the avatar is set. In the old case the email would set $emptyValue but $noImage would still be false. This we would set the empty string as email. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
MorrisJobke
force-pushed
the
fix_carddav_converter
branch
from
ed23db1 to
40633c5
Compare
|
Rebased on master to contain the fixed integration test. |
Codecov Report
@@ Coverage Diff @@
## master #7342 +/- ##
============================================
+ Coverage 50.97% 50.97% +<.01%
- Complexity 24735 24736 +1
============================================
Files 1586 1586
Lines 94257 94258 +1
Branches 1365 1365
============================================
+ Hits 48049 48051 +2
+ Misses 46208 46207 -1
|
MorrisJobke
approved these changes
Dec 11, 2017
|
Just as a side note. It fixes the integration tests. But the changed avatar behavior just highlighted the bug. The bug was already present in the code. So we should backport to the 12 series as well |
|
@blizzz @danxuliu @schiessle Mind to review this one? |
Merged
blizzz
approved these changes
Dec 11, 2017
|
@rullzer do you do the backport? |
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.
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.
Found while debugging the tests for #6876