GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[TESTS] Fix Controller/FeedsTest

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2022-03-06 23:06:40 +00:00
parent 416665d830
commit 88ace68627
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
6 changed files with 71 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/Attachment/Entity/Attachment.php
View File

@ -35,6 +35,7 @@ use App\Entity\Note;
use App\Util\Common;
use App\Util\Exception\ClientException;
use App\Util\Exception\DuplicateFoundException;
use App\Util\Exception\NoSuchFileException;
use App\Util\Exception\NotFoundException;
use App\Util\Exception\ServerException;
use DateTimeInterface;
@ -367,12 +368,14 @@ class Attachment extends Entity
* @throws ClientException
* @throws NotFoundException
* @throws ServerException
*
* @return AttachmentThumbnail
*/
public function getThumbnail(?string $size = null, bool $crop = false): ?AttachmentThumbnail
{
return AttachmentThumbnail::getOrCreate(attachment: $this, size: $size, crop: $crop);
try {
return AttachmentThumbnail::getOrCreate(attachment: $this, size: $size, crop: $crop);
} catch (NoSuchFileException) {
return null;
}
}
public function getThumbnailUrl(Note|int $note, ?string $size = null)

4
components/Attachment/Entity/AttachmentThumbnail.php
View File

@ -204,7 +204,7 @@ class AttachmentThumbnail extends Entity
try {
return Cache::get(
self::getCacheKey($attachment->getId(), $size_int),
fn () => DB::findOneBy('attachment_thumbnail', ['attachment_id' => $attachment->getId(), 'size' => $size_int]),
fn () => DB::findOneBy(self::class, ['attachment_id' => $attachment->getId(), 'size' => $size_int]),
);
} catch (NotFoundException) {
if (\is_null($attachment->getWidth()) || \is_null($attachment->getHeight())) {
@ -213,7 +213,7 @@ class AttachmentThumbnail extends Entity
[$predicted_width, $predicted_height] = self::predictScalingValues($attachment->getWidth(), $attachment->getHeight(), $size, $crop);
if (\is_null($attachment->getPath()) || !file_exists($attachment->getPath())) {
// Before we quit, check if there's any other thumb
$alternative_thumbs = DB::findBy('attachment_thumbnail', ['attachment_id' => $attachment->getId()]);
$alternative_thumbs = DB::findBy(self::class, ['attachment_id' => $attachment->getId()]);
usort($alternative_thumbs, fn ($l, $r) => $r->getSize() <=> $l->getSize());
if (empty($alternative_thumbs)) {
throw new NotStoredLocallyException();

54
components/Feed/tests/Controller/FeedsTest.php Normal file
View File

@ -0,0 +1,54 @@
<?php
declare(strict_types = 1);
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
namespace Component\Feed\tests\Controller;
use App\Core\Router\Router;
use App\Util\GNUsocialTestCase;
use Component\Feed\Controller\Feeds;
use Jchook\AssertThrows\AssertThrows;
class FeedsTest extends GNUsocialTestCase
{
use AssertThrows;
public function testPublic()
{
// This calls static::bootKernel(), and creates a "client" that is acting as the browser
$client = static::createClient();
$crawler = $client->request('GET', Router::url('feed_public'));
$this->assertResponseIsSuccessful();
}
public function testHome()
{
// This calls static::bootKernel(), and creates a "client" that is acting as the browser
$client = static::createClient();
$crawler = $client->request('GET', Router::url('feed_home'));
$this->assertResponseStatusCodeSame(302);
}
// TODO: It would be nice to actually test whether the feeds are respecting scopes and spitting
// out the expected notes... The ActivityPub plugin have a somewhat obvious way of testing it so,
// for now, having that, might fill that need, let's see
}

92
components/Feed/tests/FeedsTest.php
View File

@ -1,92 +0,0 @@
<?php
declare(strict_types = 1);
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
namespace Component\Feed\Tests\Controller;
use App\Core\DB\DB;
use App\Core\Security;
use App\Entity\Note;
use App\Util\Common;
use App\Util\Exception\ClientException;
use App\Util\GNUsocialTestCase;
use Component\Feed\Controller\Feeds;
use Jchook\AssertThrows\AssertThrows;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Security\Core\Security as SSecurity;
class FeedsTest extends GNUsocialTestCase
{
use AssertThrows;
public function testPublic()
{
$this->testRoute('public', fn ($vis) => $vis->public || $vis->site);
}
public function testHome()
{
$this->testRoute('home', fn ($vis) => !$vis->message, ['taken_user']);
}
public function testFeeds()
{
$this->testRoute('network', fn ($vis) => $vis->public);
}
// TODO replies, re-enable
// public function testReplies()
// {
// $this->testRoute('replies', fn ($vis) => $vis->public, [], function () {
// $user = DB::findOneBy('local_user', ['nickname' => 'taken_user']);
// $sec = $this->getMockBuilder(SSecurity::class)->setConstructorArgs([self::$kernel->getContainer()])->getMock();
// $sec->method('getUser')->willReturn($user);
// Security::setHelper($sec, null);
// });
// }
private function testRoute(string $route, callable $visibility, array $extra_args = [], ?callable $setup_login = null)
{
parent::bootKernel();
if (!\is_null($setup_login)) {
$setup_login();
}
$req = $this->createMock(Request::class);
$req_stack = $this->createMock(RequestStack::class);
$feeds = new Feeds($req_stack);
if ($route == 'home') {
static::assertThrows(ClientException::class, fn () => $feeds->home($req));
}
$result = $feeds->{$route}($req, ...$extra_args);
static::assertSame($result['_template'], 'collection/notes.html.twig');
foreach ($result['notes'] as $n) {
static::assertIsArray($n['replies']);
}
$notes = Common::flattenNoteArray($result['notes']);
foreach ($notes as $n) {
static::assertTrue(\get_class($n) == Note::class);
$vis = $n->getScope();
static::assertTrue($visibility($vis));
}
}
}

3
plugins/DeleteNote/DeleteNote.php
View File

@ -170,6 +170,9 @@ class DeleteNote extends NoteHandlerPlugin
&& $actor->canModerate($note->getActor())) {
$delete_action_url = Router::url('delete_note_action', ['note_id' => $note->getId()]);
$query_string = $request->getQueryString();
if (\is_null($query_string)) {
return Event::next;
}
$delete_action_url .= '?from=' . mb_substr($query_string, 2);
$actions[] = [
'title' => _m('Delete note'),

8
plugins/NoteTypeFeedFilter/NoteTypeFeedFilter.php
View File

@ -141,8 +141,12 @@ class NoteTypeFeedFilter extends Plugin
*/
public function onAddFeedActions(Request $request, bool $is_not_empty, &$res): bool
{
$qs = [];
parse_str($request->getQueryString(), $qs);
$qs = [];
$query_string = $request->getQueryString();
if (\is_null($query_string)) {
return Event::next;
}
parse_str($query_string, $qs);
if (\array_key_exists('p', $qs) && \is_string($qs['p'])) {
unset($qs['p']);
}