Tests for email collaborators pagination #8710
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
nickvergessen
commented
Mar 7, 2018
| @@ -196,7 +200,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) { | |||
| } | |||
| $searchResult->addResultSet($emailType, $result['wide'], $result['exact']); | |||
|
|
|||
| return true; | |||
There was a problem hiding this comment.
this was a pretty bad assumption, so I had to fix all tests and wrote some where it is actually supposed to be true
There was a problem hiding this comment.
Its the default for anything that cannot (or could not) paginate. I took it over as it was when i refactored it.
|
no test case where you look for $reachedEnd = true? |
MorrisJobke
reviewed
Mar 7, 2018
| if (!$this->shareeEnumeration) { | ||
| $result['wide'] = []; | ||
| $userResults['wide'] = []; | ||
| } else { | ||
| $reachedEnd = (count($result['wide']) < $offset + $limit) || |
There was a problem hiding this comment.
Isn't the end reached when both sets don't have further elements?
There was a problem hiding this comment.
yeah should have been &&
also the answer for @blizzz comment. I messed up when inverting the logic from "more results" to "end reached"
db8d664 to
d03663c
Compare
|
failing tests |
Signed-off-by: Joas Schilling <coding@schilljs.com>
d03663c to
fe30d63
Compare
Codecov Report
@@ Coverage Diff @@
## master #8710 +/- ##
=============================================
- Coverage 51.86% 34.98% -16.89%
- Complexity 25373 25374 +1
=============================================
Files 1607 1607
Lines 95170 95173 +3
Branches 1379 1379
=============================================
- Hits 49362 33297 -16065
- Misses 45808 61876 +16068
|
|
I messed up conflict resolution on rebase. |
Signed-off-by: Joas Schilling <coding@schilljs.com>
fe30d63 to
8820966
Compare
rullzer
approved these changes
Mar 8, 2018
|
Backport in #8749 |
blizzz
approved these changes
Mar 9, 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.
Followup to #8596