mirror of
https://github.com/wallabag/wallabag.git
synced 2025-09-15 18:57:05 +00:00
Use test container to replace test services definitions
This commit is contained in:
parent
742742f67d
commit
a221ec8348
7 changed files with 16 additions and 32 deletions
|
@ -132,7 +132,7 @@ class DeveloperControllerTest extends WallabagTestCase
|
|||
{
|
||||
$client = $this->getTestClient();
|
||||
$em = $client->getContainer()->get(EntityManagerInterface::class);
|
||||
$userManager = $client->getContainer()->get('fos_user.user_manager.test');
|
||||
$userManager = static::getContainer()->get('fos_user.user_manager');
|
||||
$user = $userManager->findUserBy(['username' => $username]);
|
||||
$apiClient = new Client($user);
|
||||
$apiClient->setName('My app');
|
||||
|
|
|
@ -43,10 +43,10 @@ abstract class WallabagApiTestCase extends WebTestCase
|
|||
protected function createAuthorizedClient()
|
||||
{
|
||||
$client = $this->createUnauthorizedClient();
|
||||
$container = $client->getContainer();
|
||||
$container = static::getContainer();
|
||||
|
||||
/** @var UserManager $userManager */
|
||||
$userManager = $container->get('fos_user.user_manager.test');
|
||||
$userManager = $container->get('fos_user.user_manager');
|
||||
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||
|
||||
$this->user = $userManager->findUserBy(['username' => 'admin']);
|
||||
|
|
|
@ -1313,7 +1313,8 @@ class ConfigControllerTest extends WallabagTestCase
|
|||
$client->submit($form, $data);
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
|
||||
$user = $client->getContainer()->get('fos_user.user_manager.test')->findUserBy(['username' => 'admin']);
|
||||
$user = static::getContainer()->get('fos_user.user_manager')->findUserBy(['username' => 'admin']);
|
||||
\assert($user instanceof User);
|
||||
$taggingRules = $user->getConfig()->getTaggingRules()->toArray();
|
||||
$this->assertCount(5, $taggingRules);
|
||||
$this->assertSame('title matches "football"', $taggingRules[4]->getRule());
|
||||
|
|
|
@ -5,6 +5,7 @@ namespace Tests\Wallabag\Controller;
|
|||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Tests\Wallabag\WallabagTestCase;
|
||||
use Wallabag\Entity\Entry;
|
||||
use Wallabag\Repository\UserRepository;
|
||||
|
||||
class ExportControllerTest extends WallabagTestCase
|
||||
{
|
||||
|
@ -328,11 +329,9 @@ class ExportControllerTest extends WallabagTestCase
|
|||
|
||||
private function setUpForJsonExportFromSearch()
|
||||
{
|
||||
$client = $this->getTestClient();
|
||||
$em = $this->getEntityManager();
|
||||
|
||||
$userRepository = $client->getContainer()
|
||||
->get('wallabag_user.user_repository.test');
|
||||
$userRepository = static::getContainer()->get(UserRepository::class);
|
||||
|
||||
$user = $userRepository->findOneByUserName('admin');
|
||||
$this->adminEntry = new Entry($user);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue