mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00
Code Issues Releases Wiki Activity

fixes author gambit when used with fulltext search, added test to cover (#1620)

Browse Source 
* fixes author gambit when used with fulltext search, added test to cover

* Apply fixes from StyleCI

[ci skip] [skip ci]
This commit is contained in:
Daniël Klabbers
2018-10-29 23:01:25 +01:00
committed by Franz Liedke
parent ac5a6349e4
commit b64cdb1cfe
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Discussion/Search/Gambit/AuthorGambit.php
View File

@@ -54,6 +54,6 @@ class AuthorGambit extends AbstractRegexGambit
$ids[] = $this->users->getIdForUsername($username); $ids[] = $this->users->getIdForUsername($username);
} }
$search->getQuery()->whereIn('user_id', $ids, 'and', $negate); $search->getQuery()->whereIn('discussions.user_id', $ids, 'and', $negate);
} }
} }

20
framework/core/tests/Api/Controller/ListDiscussionControllerTest.php
View File

@@ -13,9 +13,12 @@ namespace Flarum\Tests\Api\Controller;
use Flarum\Api\Controller\ListDiscussionsController; use Flarum\Api\Controller\ListDiscussionsController;
use Flarum\Discussion\Discussion; use Flarum\Discussion\Discussion;
use Flarum\Tests\Test\Concerns\RetrievesAuthorizedUsers;
class ListDiscussionControllerTest extends ApiControllerTestCase class ListDiscussionControllerTest extends ApiControllerTestCase
{ {
use RetrievesAuthorizedUsers;
protected $controller = ListDiscussionsController::class; protected $controller = ListDiscussionsController::class;
/** /**
@@ -30,4 +33,21 @@ class ListDiscussionControllerTest extends ApiControllerTestCase
$this->assertEquals(Discussion::count(), count($data['data'])); $this->assertEquals(Discussion::count(), count($data['data']));
} }
/**
* @test
*/
public function can_search_for_author()
{
$user = $this->getNormalUser();
$response = $this->callWith([], [
'filter' => [
'q' => 'author:'.$user->username.' foo'
],
'include' => 'mostRelevantPost'
]);
$this->assertEquals(200, $response->getStatusCode());
}
} }