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

[TESTS] Change relevant tests to use GNUsocialTestCase, so they can access all the needed features

Browse Source
This commit is contained in:
Hugo Sales
2021-05-06 21:56:28 +00:00
parent b9fbed2e3d
commit d49541629d
3 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Util/CommonTest.php
View File

@@ -20,24 +20,20 @@
namespace App\Tests\Util;
use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Router\Router;
use App\Core\Security;
use App\Entity\GSActor;
use App\Entity\LocalUser;
use App\Util\Common;
use App\Util\Exception\NoLoggedInUser;
use App\Util\GNUsocialTestCase;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Mapping\ClassMetadataFactory;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Jchook\AssertThrows\AssertThrows;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Security as SSecurity;
class CommonTest extends WebTestCase
class CommonTest extends GNUsocialTestCase
{
use AssertThrows;
@@ -73,8 +69,6 @@ class CommonTest extends WebTestCase
public function testUserAndActorGetters()
{
$client = static::createClient();
$sec = $this->getMockBuilder(SSecurity::class)->setConstructorArgs([self::$kernel->getContainer()])->getMock();
Security::setHelper($sec, null);
static::assertNull(Common::user());
static::assertThrows(NoLoggedInUser::class, fn () => Common::ensureLoggedIn());
static::assertFalse(Common::isLoggedIn());
@@ -112,12 +106,6 @@ class CommonTest extends WebTestCase
{
static::bootKernel();
$router = static::$container->get('router');
$url_gen = static::$container->get(UrlGeneratorInterface::class);
$event_dispatcher = static::$container->get(EventDispatcherInterface::class);
Router::setRouter($router, $url_gen);
Event::setDispatcher($event_dispatcher);
static::assertTrue(Common::isSystemPath('login'));
static::assertFalse(Common::isSystemPath('non-existent-path'));
}