From 543c48c13bd157f55fded1004f29cdf4be1caa5a Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Thu, 11 Oct 2018 02:06:18 +0200 Subject: [PATCH] * [FIX] Fixed unit test for auth tokens Signed-off-by: nuxsmin --- lib/SP/Repositories/AuthToken/AuthTokenRepository.php | 3 ++- tests/SP/Repositories/AuthTokenRepositoryTest.php | 1 + tests/SP/Services/AuthToken/AuthTokenServiceTest.php | 1 + tests/res/config/config.xml | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php index 0b95bab9..1a10f1cf 100644 --- a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php +++ b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php @@ -189,10 +189,11 @@ final class AuthTokenRepository extends Repository implements RepositoryItemInte INNER JOIN User ON AuthToken.userid = User.id'); if ($itemSearchData->getSeachString() !== '') { - $queryData->setWhere('User.login LIKE ?'); + $queryData->setWhere('User.login LIKE ? OR User.name LIKE ?'); $search = '%' . $itemSearchData->getSeachString() . '%'; $queryData->addParam($search); + $queryData->addParam($search); } $queryData->setOrder('User.login, AuthToken.actionId'); diff --git a/tests/SP/Repositories/AuthTokenRepositoryTest.php b/tests/SP/Repositories/AuthTokenRepositoryTest.php index a99835c1..7df3196d 100644 --- a/tests/SP/Repositories/AuthTokenRepositoryTest.php +++ b/tests/SP/Repositories/AuthTokenRepositoryTest.php @@ -234,6 +234,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase public function testSearch() { $itemSearchData = new ItemSearchData(); + $itemSearchData->setLimitCount(10); $itemSearchData->setSeachString('admin'); $result = self::$repository->search($itemSearchData); diff --git a/tests/SP/Services/AuthToken/AuthTokenServiceTest.php b/tests/SP/Services/AuthToken/AuthTokenServiceTest.php index ef086031..cb6f330a 100644 --- a/tests/SP/Services/AuthToken/AuthTokenServiceTest.php +++ b/tests/SP/Services/AuthToken/AuthTokenServiceTest.php @@ -232,6 +232,7 @@ class AuthTokenServiceTest extends DatabaseTestCase public function testSearch() { $itemSearchData = new ItemSearchData(); + $itemSearchData->setLimitCount(10); $itemSearchData->setSeachString('admin'); $result = self::$service->search($itemSearchData); diff --git a/tests/res/config/config.xml b/tests/res/config/config.xml index 584393a6..70c8eda7 100644 --- a/tests/res/config/config.xml +++ b/tests/res/config/config.xml @@ -9,11 +9,11 @@ 1 1 - aceecb4ce45b094ed394427d60aed8d6a216d413 + 49cd7d086019611d6dd17dbdda9add80a86a843f 0 0 - 1538822436 - 551729e44bdcd0c436840f2a75e6ba54da458a96 + 1539216318 + 02b5d4010c10b8abda92c3d3fc982b30910c33e7 @@ -32,7 +32,7 @@ 0 - ba290a3d6447a827eda305c0ac6f44985de47740 + a17899853134d82a571f098b918d13c50df21923 PDF JPG