Reenable Incoming test and fixes an array_reverse() bug

diff --git a/src/Module/Api/Twitter/Friendships/Incoming.php b/src/Module/Api/Twitter/Friendships/Incoming.php
index fed2bffbccea424ee72bae72384e129c161fea98..9cfcd056dcb09e62187ed0a65fcab3c0a715831a 100644 (file)
--- 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 fbc5868424c2a20f00106f5348041e721e8dded8..363f8d73c36907f7b959eb4ac0671367a92b6de8 100644 (file)
--- 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 5832800972a7c3fb064b6d74c5ac0c3f142f7901..8c5cb6426b087147629d5a86f0636f0e3a48ccac 100644 (file)
--- 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'));
        }