Reenable Twitter/UserTimeline tests

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index ba713c7651c88a3556e70299162e5d3ff452dbe7..65f5c35146eede797953c11cdc9932fc0038941c 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -40,17 +40,17 @@ class UserTimeline extends BaseApi
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
-               Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $_REQUEST]);
+               Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $request]);
 
-               $cid             = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['profileurl'] ?? '', $_REQUEST['user_id'] ?? 0, $uid);
-               $since_id        = $_REQUEST['since_id'] ?? 0;
-               $max_id          = $_REQUEST['max_id']   ?? 0;
-               $exclude_replies = !empty($_REQUEST['exclude_replies']);
-               $conversation_id = $_REQUEST['conversation_id'] ?? 0;
+               $cid             = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
+               $since_id        = $request['since_id'] ?? 0;
+               $max_id          = $request['max_id']   ?? 0;
+               $exclude_replies = !empty($request['exclude_replies']);
+               $conversation_id = $request['conversation_id'] ?? 0;
 
                // pagination
-               $count = $_REQUEST['count'] ?? 20;
-               $page  = $_REQUEST['page']  ?? 1;
+               $count = $request['count'] ?? 20;
+               $page  = $request['page']  ?? 1;
 
                $start = max(0, ($page - 1) * $count);
 
@@ -74,7 +74,7 @@ class UserTimeline extends BaseApi
                $params   = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $statuses = Post::selectForUser($uid, [], $condition, $params);
 
-               $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
+               $include_entities = strtolower(($request['include_entities'] ?? 'false') == 'true');
 
                $ret = [];
                while ($status = DBA::fetch($statuses)) {
@@ -82,6 +82,6 @@ class UserTimeline extends BaseApi
                }
                DBA::close($statuses);
 
-               $this->response->exit('user', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }

diff --git a/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php b/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
index 1e4f9cbb7e6ad504151dcbda89b9d8f3de7b7818..fc2565e31c4057d9529d11f463b54999d8ca6af1 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
@@ -2,6 +2,10 @@
 
 namespace Friendica\Test\src\Module\Api\Twitter\Statuses;
 
+use Friendica\App\Router;
+use Friendica\Capabilities\ICanCreateResponses;
+use Friendica\DI;
+use Friendica\Module\Api\Twitter\Statuses\UserTimeline;
 use Friendica\Test\src\Module\Api\ApiTest;
 
 class UserTimelineTest extends ApiTest
@@ -13,18 +17,23 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimeline()
        {
-               /*
-                       $_REQUEST['user_id']         = 42;
-                       $_REQUEST['max_id']          = 10;
-                       $_REQUEST['exclude_replies'] = true;
-                       $_REQUEST['conversation_id'] = 7;
-
-                       $result = api_statuses_user_timeline('json');
-                       self::assertNotEmpty($result['status']);
-                       foreach ($result['status'] as $status) {
-                               self::assertStatus($status);
-                       }
-                       */
+               $networkPublicTimeline = new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]);
+
+               $response = $networkPublicTimeline->run([
+                       'user_id'         => 42,
+                       'max_id'          => 10,
+                       'exclude_replies' => true,
+                       'conversation_id' => 7,
+               ]);
+
+               $json = $this->toJson($response);
+
+               self::assertIsArray($json);
+               self::assertNotEmpty($json);
+               foreach ($json as $status) {
+                       self::assertIsString($status->text);
+                       self::assertIsInt($status->id);
+               }
        }
 
        /**
@@ -34,16 +43,21 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimelineWithNegativePage()
        {
-               /*
-               $_REQUEST['user_id'] = 42;
-               $_REQUEST['page']    = -2;
-
-               $result = api_statuses_user_timeline('json');
-               self::assertNotEmpty($result['status']);
-               foreach ($result['status'] as $status) {
-                       self::assertStatus($status);
+               $networkPublicTimeline = new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]);
+
+               $response = $networkPublicTimeline->run([
+                       'user_id' => 42,
+                       'page'    => -2,
+               ]);
+
+               $json = $this->toJson($response);
+
+               self::assertIsArray($json);
+               self::assertNotEmpty($json);
+               foreach ($json as $status) {
+                       self::assertIsString($status->text);
+                       self::assertIsInt($status->id);
                }
-               */
        }
 
        /**
@@ -53,8 +67,13 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimelineWithRss()
        {
-               // $result = api_statuses_user_timeline('rss');
-               // self::assertXml($result, 'statuses');
+               $networkPublicTimeline = new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => ICanCreateResponses::TYPE_RSS]);
+
+               $response = $networkPublicTimeline->run();
+
+               self::assertEquals(ICanCreateResponses::TYPE_RSS, $response->getHeaderLine(ICanCreateResponses::X_HEADER));
+
+               self::assertXml((string)$response->getBody(), 'statuses');
        }
 
        /**
@@ -64,6 +83,8 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimelineWithUnallowedUser()
        {
+               self::markTestIncomplete('Needs BasicAuth as dynamic method for overriding first');
+
                // $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                // BasicAuth::setCurrentUserID();
                // api_statuses_user_timeline('json');