diff --git a/src/Module/Api/Twitter/Friendships/Incoming.php b/src/Module/Api/Twitter/Friendships/Incoming.php index fed2bffbcc..9cfcd056dc 100644 --- a/src/Module/Api/Twitter/Friendships/Incoming.php +++ b/src/Module/Api/Twitter/Friendships/Incoming.php @@ -86,6 +86,6 @@ class Incoming extends ContactEndpoint self::setLinkHeader(); - System::jsonExit($return); + $this->response->exit('incoming', ['incoming' => $return]); } } diff --git a/tests/src/Module/Api/Twitter/Friends/ListsTest.php b/tests/src/Module/Api/Twitter/Friends/ListsTest.php index fbc5868424..363f8d73c3 100644 --- a/tests/src/Module/Api/Twitter/Friends/ListsTest.php +++ b/tests/src/Module/Api/Twitter/Friends/ListsTest.php @@ -26,9 +26,6 @@ class ListsTest extends ApiTest $json = json_decode($body); self::assertIsArray($json->users); - - // $result = api_statuses_f('friends'); - // self::assertArrayHasKey('user', $result); } /** diff --git a/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php b/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php index 5832800972..8c5cb6426b 100644 --- a/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php +++ b/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php @@ -2,6 +2,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Friendships; +use Friendica\App\Router; +use Friendica\DI; +use Friendica\Module\Api\Twitter\Friendships\Incoming; use Friendica\Test\src\Module\Api\ApiTest; class IncomingTest extends ApiTest @@ -13,8 +16,16 @@ class IncomingTest extends ApiTest */ public function testApiFriendshipsIncoming() { - // $result = api_friendships_incoming('json'); - // self::assertArrayHasKey('id', $result); + $lists = new Incoming(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]); + $response = $lists->run(); + + $body = (string)$response->getBody(); + + self::assertJson($body); + + $json = json_decode($body); + + self::assertIsArray($json->ids); } /** @@ -24,6 +35,8 @@ class IncomingTest extends ApiTest */ public function testApiFriendshipsIncomingWithUndefinedCursor() { + self::markTestIncomplete('Needs refactoring of Incoming - replace filter_input() with $request parameter checks'); + // $_GET['cursor'] = 'undefined'; // self::assertFalse(api_friendships_incoming('json')); }