Reenable Twitter/Search test

diff --git a/src/Module/Api/Twitter/Users/Search.php b/src/Module/Api/Twitter/Users/Search.php
index 9c7be2f5153d5173951250d8b13c42d3fa4a25c4..d53ba1e9b6ca1492aaa57f1f48ef08addacb2027 100644 (file)
--- a/src/Module/Api/Twitter/Users/Search.php
+++ b/src/Module/Api/Twitter/Users/Search.php
@@ -42,15 +42,15 @@ class Search extends BaseApi
 
                $userlist = [];
 
-               if (!empty($_GET['q'])) {
+               if (!empty($request['q'])) {
                        $contacts = Contact::selectToArray(
                                ['id'],
                                [
                                        '`uid` = 0 AND (`name` = ? OR `nick` = ? OR `url` = ? OR `addr` = ?)',
-                                       $_GET['q'],
-                                       $_GET['q'],
-                                       $_GET['q'],
-                                       $_GET['q'],
+                                       $request['q'],
+                                       $request['q'],
+                                       $request['q'],
+                                       $request['q'],
                                ]
                        );
 
@@ -63,12 +63,12 @@ class Search extends BaseApi
                                }
                                $userlist = ['users' => $userlist];
                        } else {
-                               throw new NotFoundException('User ' . $_GET['q'] . ' not found.');
+                               throw new NotFoundException('User ' . $request['q'] . ' not found.');
                        }
                } else {
                        throw new BadRequestException('No search term specified.');
                }
 
-               $this->response->exit('users', ['user' => $userlist], $this->parameters['extension'] ?? null);
+               $this->response->exit('users', $userlist, $this->parameters['extension'] ?? null);
        }
 }

diff --git a/tests/src/Module/Api/Twitter/Users/SearchTest.php b/tests/src/Module/Api/Twitter/Users/SearchTest.php
index ce088a541285ad6e68bbb10f2b5bd8e67f20b148..4fee774daca733d8ca232a02831a4f56abbf4bd2 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/SearchTest.php
+++ b/tests/src/Module/Api/Twitter/Users/SearchTest.php
@@ -2,6 +2,11 @@
 
 namespace Friendica\Test\src\Module\Api\Twitter\Users;
 
+use Friendica\App\Router;
+use Friendica\Capabilities\ICanCreateResponses;
+use Friendica\DI;
+use Friendica\Module\Api\Twitter\Users\Search;
+use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Test\src\Module\Api\ApiTest;
 
 class SearchTest extends ApiTest
@@ -13,9 +18,12 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearch()
        {
-               // $_GET['q'] = 'othercontact';
-               // $result    = api_users_search('json');
-               // self::assertOtherUser($result['users'][0]);
+               $search = new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]);
+               $respone = $search->run(['q' => static::OTHER_USER['name']]);
+
+               $json = $this->toJson($respone);
+
+               self::assertOtherUser($json[0]);
        }
 
        /**
@@ -25,9 +33,10 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearchWithXml()
        {
-               // $_GET['q'] = 'othercontact';
-               // $result    = api_users_search('xml');
-               // self::assertXml($result, 'users');
+               $search = new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => ICanCreateResponses::TYPE_XML]);
+               $respone = $search->run(['q' => static::OTHER_USER['name']]);
+
+               self::assertXml((string)$respone->getBody(), 'users');
        }
 
        /**
@@ -37,7 +46,9 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearchWithoutQuery()
        {
-               // $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
-               // api_users_search('json');
+               $this->expectException(BadRequestException::class);
+
+               $search = new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]);
+               $search->run();
        }
 }