Reenable Twitter/Destroy tests

diff --git a/src/Module/Api/Twitter/Statuses/Destroy.php b/src/Module/Api/Twitter/Statuses/Destroy.php
index a8c4be6f4e0b3228e22b40083b611a6dddba0d49..8c2a8bf3eb6e4d3f841c2123ba4189595602d188 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -26,6 +26,7 @@ use Friendica\Module\BaseApi;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;

+use Friendica\Network\HTTPException\BadRequestException;

 
 /**
  * Destroys a specific status.
 
 /**
  * Destroys a specific status.


@@ -39,10 +40,12 @@ class Destroy extends BaseApi
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 

-               if (empty($this->parameters['id'])) {
-                       $id = intval($request['id'] ?? 0);
-               } else {
+               if (empty($this->parameters['id']) && !empty($request['id'])) {
+                       $id = intval($request['id']);
+               } elseif (!empty($this->parameters['id'])) {

                        $id = (int)$this->parameters['id'];
                        $id = (int)$this->parameters['id'];

+               } else {
+                       throw new BadRequestException('An id is missing.');

                }
 
                $this->logger->notice('API: api_statuses_destroy: ' . $id);
                }
 
                $this->logger->notice('API: api_statuses_destroy: ' . $id);

diff --git a/tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php b/tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php
index f2a709531cdf9a0381d6995f873f3492b31a5af7..297c92bae10b996c48428892343d21af6b6ed4c9 100644 (file)
--- a/tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php
+++ b/tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php
@@ -2,9 +2,6 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Accounts;
 
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Accounts;
 

-use Friendica\App\Router;
-use Friendica\DI;
-use Friendica\Module\Api\Mastodon\Accounts\Statuses;

 use Friendica\Test\src\Module\Api\ApiTest;
 
 class StatusesTest extends ApiTest
 use Friendica\Test\src\Module\Api\ApiTest;
 
 class StatusesTest extends ApiTest

diff --git a/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php b/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
index 73f32c5d6b14ae891522fc3b57fa484f05211fbd..9b2110eb6b82536a6d36cac864f8ad7b4e199f3f 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
@@ -2,6 +2,10 @@
 
 namespace Friendica\Test\src\Module\Api\Twitter\Statuses;
 
 
 namespace Friendica\Test\src\Module\Api\Twitter\Statuses;
 

+use Friendica\App\Router;
+use Friendica\DI;
+use Friendica\Module\Api\Twitter\Statuses\Destroy;
+use Friendica\Network\HTTPException\BadRequestException;

 use Friendica\Test\src\Module\Api\ApiTest;
 
 class DestroyTest extends ApiTest
 use Friendica\Test\src\Module\Api\ApiTest;
 
 class DestroyTest extends ApiTest


@@ -13,8 +17,10 @@ class DestroyTest extends ApiTest
         */
        public function testApiStatusesDestroy()
        {
         */
        public function testApiStatusesDestroy()
        {

-               // $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
-               // api_statuses_destroy('json');
+               $this->expectException(BadRequestException::class);
+
+               $destroy = new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
+               $destroy->run();

        }
 
        /**
        }
 
        /**


@@ -24,6 +30,8 @@ class DestroyTest extends ApiTest
         */
        public function testApiStatusesDestroyWithoutAuthenticatedUser()
        {
         */
        public function testApiStatusesDestroyWithoutAuthenticatedUser()
        {

+               self::markTestIncomplete('Needs BasicAuth as dynamic method for overriding first');
+

                // $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                // BasicAuth::setCurrentUserID();
                // $_SESSION['authenticated'] = false;
                // $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                // BasicAuth::setCurrentUserID();
                // $_SESSION['authenticated'] = false;


@@ -37,8 +45,13 @@ class DestroyTest extends ApiTest
         */
        public function testApiStatusesDestroyWithId()
        {
         */
        public function testApiStatusesDestroyWithId()
        {

-               // DI::args()->setArgv(['', '', '', 1]);
-               // $result = api_statuses_destroy('json');
-               // self::assertStatus($result['status']);
+               $destroy = new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
+               $response = $destroy->run(['id' => 1]);
+
+               $json = $this->toJson($response);
+
+               self::assertEquals(1, $json->id);
+               self::assertIsObject($json->user);
+               self::assertIsObject($json->friendica_author);

        }
 }
        }
 }