tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Move DirectMessages/Destory tests & fix Destroy condition

Browse source
This commit is contained in:
Philipp Holzer 2021-12-30 19:58:19 +01:00
parent 3374cac767
commit 0c4c6faa54
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
3 changed files with 113 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Twitter/DirectMessages/Destroy.php
View file

@ -58,7 +58,7 @@ class Destroy extends BaseApi
$parenturi = $request['friendica_parenturi'] ?? '';
// error if no id or parenturi specified (for clients posting parent-uri as well)
if ($verbose && ($id == 0 || $parenturi == "")) {
if ($verbose && $id == 0 && $parenturi == "") {
$answer = ['result' => 'error', 'message' => 'message id or parenturi not specified'];
$this->response->exit('direct_messages_delete', ['direct_messages_delete' => $answer], $this->parameters['extension'] ?? null);
return;

97
tests/legacy/ApiTest.php
View file

@ -1189,103 +1189,6 @@ class ApiTest extends FixtureTest
// self::assertArrayHasKey('user', $result);
}
/**
* Test the api_direct_messages_destroy() function.
*
* @return void
*/
public function testApiDirectMessagesDestroy()
{
//$this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
//api_direct_messages_destroy('json');
}
/**
* Test the api_direct_messages_destroy() function with the friendica_verbose GET param.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithVerbose()
{
/*
$_GET['friendica_verbose'] = 'true';
$result = api_direct_messages_destroy('json');
self::assertEquals(
[
'$result' => [
'result' => 'error',
'message' => 'message id or parenturi not specified'
]
],
$result
);
*/
}
/**
* Test the api_direct_messages_destroy() function without an authenticated user.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithoutAuthenticatedUser()
{
/*
$this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
BasicAuth::setCurrentUserID();
$_SESSION['authenticated'] = false;
api_direct_messages_destroy('json');
*/
}
/**
* Test the api_direct_messages_destroy() function with a non-zero ID.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithId()
{
/*
$this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
$_REQUEST['id'] = 1;
api_direct_messages_destroy('json');
*/
}
/**
* Test the api_direct_messages_destroy() with a non-zero ID and the friendica_verbose GET param.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithIdAndVerbose()
{
/*
$_REQUEST['id'] = 1;
$_REQUEST['friendica_parenturi'] = 'parent_uri';
$_GET['friendica_verbose'] = 'true';
$result = api_direct_messages_destroy('json');
self::assertEquals(
[
'$result' => [
'result' => 'error',
'message' => 'message id not in database'
]
],
$result
);
*/
}
/**
* Test the api_direct_messages_destroy() function with a non-zero ID.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithCorrectId()
{
$this->markTestIncomplete('We need to add a dataset for this.');
}
/**
* Test the api_direct_messages_box() function.
*

112
tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php Normal file
View file

@ -0,0 +1,112 @@
<?php
namespace Friendica\Test\src\Module\Api\Twitter\DirectMessages;
use Friendica\App\Router;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\Api\Twitter\DirectMessages\Destroy;
use Friendica\Test\src\Module\Api\ApiTest;
class DestroyTest extends ApiTest
{
/**
* Test the api_direct_messages_destroy() function.
*
* @return void
*/
public function testApiDirectMessagesDestroy()
{
$this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
(new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))->run();
}
/**
* Test the api_direct_messages_destroy() function with the friendica_verbose GET param.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithVerbose()
{
$destroy = new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']);
$response = $destroy->run([
'friendica_verbose' => true,
]);
$json = $this->toJson($response);
self::assertEquals('error', $json->result);
self::assertEquals('message id or parenturi not specified', $json->message);
}
/**
* Test the api_direct_messages_destroy() function without an authenticated user.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithoutAuthenticatedUser()
{
self::markTestIncomplete('Needs BasicAuth as dynamic method for overriding first');
/*
$this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
BasicAuth::setCurrentUserID();
$_SESSION['authenticated'] = false;
api_direct_messages_destroy('json');
*/
}
/**
* Test the api_direct_messages_destroy() function with a non-zero ID.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithId()
{
$this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
(new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))->run(['id' => 1]);
}
/**
* Test the api_direct_messages_destroy() with a non-zero ID and the friendica_verbose GET param.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithIdAndVerbose()
{
$destroy = new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']);
$response = $destroy->run([
'id' => 1,
'friendica_parenturi' => 'parent_uri',
'friendica_verbose' => true,
]);
$json = $this->toJson($response);
self::assertEquals('error', $json->result);
self::assertEquals('message id not in database', $json->message);
}
/**
* Test the api_direct_messages_destroy() function with a non-zero ID.
*
* @return void
*/
public function testApiDirectMessagesDestroyWithCorrectId()
{
$this->loadFixture(__DIR__ . '/../../../../../datasets/mail/mail.fixture.php', DI::dba());
$ids = DBA::selectToArray('mail', ['id']);
$id = $ids[0]['id'];
$destroy = new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']);
$response = $destroy->run([
'id' => $id,
'friendica_verbose' => true,
]);
$json = $this->toJson($response);
self::assertEquals('ok', $json->result);
self::assertEquals('message deleted', $json->message);
}
}