mirror of
https://github.com/friendica/friendica
synced 2024-12-23 02:00:17 +00:00
Fix tests
This commit is contained in:
parent
ce578a7745
commit
f3d7d610e8
9 changed files with 27 additions and 20 deletions
|
@ -54,7 +54,7 @@ class ModuleControllerTest extends DatabaseTest
|
|||
self::assertModule([
|
||||
'isBackend' => false,
|
||||
'name' => App\ModuleController::DEFAULT,
|
||||
'class' => new $defaultClass(),
|
||||
'class' => null,
|
||||
], $module);
|
||||
}
|
||||
|
||||
|
@ -146,28 +146,28 @@ class ModuleControllerTest extends DatabaseTest
|
|||
'name' => App\ModuleController::DEFAULT,
|
||||
'command' => App\ModuleController::DEFAULT,
|
||||
'privAdd' => false,
|
||||
'args' => [],
|
||||
'args' => [Mockery::mock(L10n::class)],
|
||||
],
|
||||
'legacy' => [
|
||||
'assert' => LegacyModule::class,
|
||||
'name' => 'display',
|
||||
'command' => 'display/test/it',
|
||||
'privAdd' => false,
|
||||
'args' => [__DIR__ . '/../../datasets/legacy/legacy.php'],
|
||||
'args' => [Mockery::mock(L10n::class), __DIR__ . '/../../datasets/legacy/legacy.php'],
|
||||
],
|
||||
'new' => [
|
||||
'assert' => HostMeta::class,
|
||||
'not_required',
|
||||
'command' => '.well-known/host-meta',
|
||||
'privAdd' => false,
|
||||
'args' => [],
|
||||
'args' => [Mockery::mock(L10n::class)],
|
||||
],
|
||||
'404' => [
|
||||
'assert' => PageNotFound::class,
|
||||
'name' => 'invalid',
|
||||
'command' => 'invalid',
|
||||
'privAdd' => false,
|
||||
'args' => [],
|
||||
'args' => [Mockery::mock(L10n::class)],
|
||||
]
|
||||
];
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ class NotificationTest extends ApiTest
|
|||
</notes>
|
||||
XML;
|
||||
|
||||
$notification = new Notification(['extension' => 'xml']);
|
||||
$notification = new Notification(DI::l10n(), ['extension' => 'xml']);
|
||||
$notification->rawContent();
|
||||
|
||||
self::assertXmlStringEqualsXmlString($assertXml, ApiResponseDouble::getOutput());
|
||||
|
@ -75,7 +75,7 @@ XML;
|
|||
|
||||
public function testWithJsonResult()
|
||||
{
|
||||
$notification = new Notification(['parameter' => 'json']);
|
||||
$notification = new Notification(DI::l10n(),['parameter' => 'json']);
|
||||
$notification->rawContent();
|
||||
|
||||
$result = json_encode(ApiResponseDouble::getOutput());
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\Friendica\Photo;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\Friendica\Photo\Delete;
|
||||
use Friendica\Network\HTTPException\BadRequestException;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
|
@ -30,7 +31,7 @@ class DeleteTest extends ApiTest
|
|||
public function testEmpty()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Delete())->rawContent();
|
||||
(new Delete(DI::l10n()))->rawContent();
|
||||
}
|
||||
|
||||
public function testWithoutAuthenticatedUser()
|
||||
|
@ -41,7 +42,7 @@ class DeleteTest extends ApiTest
|
|||
public function testWrong()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Delete(['photo_id' => 1]))->rawContent();
|
||||
(new Delete(DI::l10n(), ['photo_id' => 1]))->rawContent();
|
||||
}
|
||||
|
||||
public function testWithCorrectPhotoId()
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\Friendica\Photoalbum;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\Friendica\Photoalbum\Delete;
|
||||
use Friendica\Network\HTTPException\BadRequestException;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
|
@ -30,13 +31,13 @@ class DeleteTest extends ApiTest
|
|||
public function testEmpty()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Delete())->rawContent();
|
||||
(new Delete(DI::l10n()))->rawContent();
|
||||
}
|
||||
|
||||
public function testWrong()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Delete(['album' => 'album_name']))->rawContent();
|
||||
(new Delete(DI::l10n(), ['album' => 'album_name']))->rawContent();
|
||||
}
|
||||
|
||||
public function testValid()
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\Friendica\Photoalbum;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\Friendica\Photoalbum\Update;
|
||||
use Friendica\Network\HTTPException\BadRequestException;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
|
@ -30,19 +31,19 @@ class UpdateTest extends ApiTest
|
|||
public function testEmpty()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Update())->rawContent();
|
||||
(new Update(DI::l10n()))->rawContent();
|
||||
}
|
||||
|
||||
public function testTooFewArgs()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Update(['album' => 'album_name']))->rawContent();
|
||||
(new Update(DI::l10n(), ['album' => 'album_name']))->rawContent();
|
||||
}
|
||||
|
||||
public function testWrongUpdate()
|
||||
{
|
||||
$this->expectException(BadRequestException::class);
|
||||
(new Update(['album' => 'album_name', 'album_new' => 'album_name']))->rawContent();
|
||||
(new Update(DI::l10n(), ['album' => 'album_name', 'album_new' => 'album_name']))->rawContent();
|
||||
}
|
||||
|
||||
public function testWithoutAuthenticatedUser()
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\GNUSocial\GNUSocial\Version;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
use Friendica\Test\Util\ApiResponseDouble;
|
||||
|
@ -10,7 +11,7 @@ class VersionTest extends ApiTest
|
|||
{
|
||||
public function test()
|
||||
{
|
||||
$version = new Version(['extension' => 'json']);
|
||||
$version = new Version(DI::l10n(), ['extension' => 'json']);
|
||||
$version->rawContent();
|
||||
|
||||
$result = json_decode(ApiResponseDouble::getOutput());
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\GnuSocial\Help;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\GNUSocial\Help\Test;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
use Friendica\Test\Util\ApiResponseDouble;
|
||||
|
@ -10,7 +11,7 @@ class TestTest extends ApiTest
|
|||
{
|
||||
public function testJson()
|
||||
{
|
||||
$test = new Test(['extension' => 'json']);
|
||||
$test = new Test(DI::l10n(), ['extension' => 'json']);
|
||||
$test->rawContent();
|
||||
|
||||
self::assertEquals('"ok"', ApiResponseDouble::getOutput());
|
||||
|
@ -18,7 +19,7 @@ class TestTest extends ApiTest
|
|||
|
||||
public function testXml()
|
||||
{
|
||||
$test = new Test(['extension' => 'xml']);
|
||||
$test = new Test(DI::l10n(), ['extension' => 'xml']);
|
||||
$test->rawContent();
|
||||
|
||||
self::assertxml(ApiResponseDouble::getOutput(), 'ok');
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\Twitter\Account;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\Twitter\Account\RateLimitStatus;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
use Friendica\Test\Util\ApiResponseDouble;
|
||||
|
@ -10,7 +11,7 @@ class RateLimitStatusTest extends ApiTest
|
|||
{
|
||||
public function testWithJson()
|
||||
{
|
||||
$rateLimitStatus = new RateLimitStatus(['extension' => 'json']);
|
||||
$rateLimitStatus = new RateLimitStatus(DI::l10n(), ['extension' => 'json']);
|
||||
$rateLimitStatus->rawContent();
|
||||
|
||||
$result = json_decode(ApiResponseDouble::getOutput());
|
||||
|
@ -22,7 +23,7 @@ class RateLimitStatusTest extends ApiTest
|
|||
|
||||
public function testWithXml()
|
||||
{
|
||||
$rateLimitStatus = new RateLimitStatus(['extension' => 'xml']);
|
||||
$rateLimitStatus = new RateLimitStatus(DI::l10n(),['extension' => 'xml']);
|
||||
$rateLimitStatus->rawContent();
|
||||
|
||||
self::assertXml(ApiResponseDouble::getOutput(), 'hash');
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace Friendica\Test\src\Module\Api\Twitter;
|
||||
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Api\Twitter\SavedSearches;
|
||||
use Friendica\Test\src\Module\Api\ApiTest;
|
||||
use Friendica\Test\Util\ApiResponseDouble;
|
||||
|
@ -10,7 +11,7 @@ class SavedSearchesTest extends ApiTest
|
|||
{
|
||||
public function test()
|
||||
{
|
||||
$savedSearch = new SavedSearches(['extension' => 'json']);
|
||||
$savedSearch = new SavedSearches(DI::l10n(), ['extension' => 'json']);
|
||||
$savedSearch->rawContent();
|
||||
|
||||
$result = json_decode(ApiResponseDouble::getOutput());
|
||||
|
|
Loading…
Reference in a new issue