Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't create sorter instances when none was requested #7324

Merged
merged 1 commit into from
Dec 11, 2017
Merged

don't create sorter instances when none was requested #7324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions core/Controller/AutoCompleteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ public function get($search, $itemType, $itemId, $sorter = null, $shareTypes = [
unset($results['exact']);
$results = array_merge_recursive($exactMatches, $results);

$sorters = array_reverse(explode('|', $sorter));
$this->autoCompleteManager->runSorters($sorters, $results, [
'itemType' => $itemType,
'itemId' => $itemId,
]);
if($sorter !== null) {
$sorters = array_reverse(explode('|', $sorter));
$this->autoCompleteManager->runSorters($sorters, $results, [
'itemType' => $itemType,
'itemId' => $itemId,
]);
}

// transform to expected format
$results = $this->prepareResultArray($results);
Expand Down
140 changes: 99 additions & 41 deletions tests/Core/Controller/AutoCompleteControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,57 +59,115 @@ protected function setUp() {
);
}

public function testGet() {
$searchResults = [
'exact' => [
'users' => [],
'robots' => [],
],
'users' => [
['label' => 'Alice A.', 'value' => ['shareWith' => 'alice']],
['label' => 'Bob Y.', 'value' => ['shareWith' => 'bob']],
public function searchDataProvider() {
return [
[ #0 – regular search
// searchResults
[
'exact' => [
'users' => [],
'robots' => [],
],
'users' => [
['label' => 'Alice A.', 'value' => ['shareWith' => 'alice']],
['label' => 'Bob Y.', 'value' => ['shareWith' => 'bob']],
],
],
// expected
[
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
],
'',
'files',
'42',
null
],
];

$expected = [
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
];

$this->collaboratorSearch->expects($this->once())
->method('search')
->willReturn([$searchResults, false]);

$response = $this->controller->get('', 'files', '42', null);

$list = $response->getData();
$this->assertEquals($expected, $list); // has better error output…
$this->assertSame($expected, $list);
}

public function testGetWithExactMatch() {
$searchResults = [
'exact' => [
'users' => [
['label' => 'Bob Y.', 'value' => ['shareWith' => 'bob']],
[ #1 – missing itemtype and id
[
'exact' => [
'users' => [],
'robots' => [],
],
'users' => [
['label' => 'Alice A.', 'value' => ['shareWith' => 'alice']],
['label' => 'Bob Y.', 'value' => ['shareWith' => 'bob']],
],
],
'robots' => [],
// expected
[
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
],
'',
null,
null,
null
],
'users' => [
['label' => 'Robert R.', 'value' => ['shareWith' => 'bobby']],
[ #2 – with sorter
[
'exact' => [
'users' => [],
'robots' => [],
],
'users' => [
['label' => 'Alice A.', 'value' => ['shareWith' => 'alice']],
['label' => 'Bob Y.', 'value' => ['shareWith' => 'bob']],
],
],
// expected
[
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
],
'',
'files',
'42',
'karma|bus-factor'
],
[ #3 – exact Match
[
'exact' => [
'users' => [
['label' => 'Bob Y.', 'value' => ['shareWith' => 'bob']],
],
'robots' => [],
],
'users' => [
['label' => 'Robert R.', 'value' => ['shareWith' => 'bobby']],
],
],
[
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
[ 'id' => 'bobby', 'label' => 'Robert R.', 'source' => 'users'],
],
'bob',
'files',
'42',
null
]
];
}

$expected = [
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
[ 'id' => 'bobby', 'label' => 'Robert R.', 'source' => 'users'],
];

/**
* @param $searchResults
* @param $expected
* @param $searchTerm
* @param $itemType
* @param $itemId
* @param $sorter
* @dataProvider searchDataProvider
*/
public function testGet($searchResults, $expected, $searchTerm, $itemType, $itemId, $sorter) {
$this->collaboratorSearch->expects($this->once())
->method('search')
->willReturn([$searchResults, false]);

$response = $this->controller->get('bob', 'files', '42', null);
$runSorterFrequency = $sorter === null ? $this->never() : $this->once();
$this->autoCompleteManager->expects($runSorterFrequency)
->method('runSorters');

$response = $this->controller->get($searchTerm, $itemType, $itemId, $sorter);

$list = $response->getData();
$this->assertEquals($expected, $list); // has better error output…
Expand Down