forked from wallabag/wallabag
Migrate getRepository with entities
This commit is contained in:
@ -7,7 +7,9 @@ use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
||||
use Wallabag\AnnotationBundle\Entity\Annotation;
|
||||
use Wallabag\CoreBundle\Entity\Config;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
|
||||
use Wallabag\CoreBundle\Entity\Tag;
|
||||
use Wallabag\CoreBundle\Entity\TaggingRule;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
class ConfigControllerTest extends WallabagCoreTestCase
|
||||
@ -306,7 +308,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
// reset the token
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
if (!$user) {
|
||||
@ -570,7 +572,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
|
||||
$rule = $client->getContainer()->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:TaggingRule')
|
||||
->getRepository(TaggingRule::class)
|
||||
->findAll()[0];
|
||||
|
||||
$crawler = $client->request('GET', '/tagging-rule/delete/' . $rule->getId());
|
||||
@ -586,7 +588,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
|
||||
$rule = $client->getContainer()->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:TaggingRule')
|
||||
->getRepository(TaggingRule::class)
|
||||
->findAll()[0];
|
||||
|
||||
$crawler = $client->request('GET', '/tagging-rule/edit/' . $rule->getId());
|
||||
@ -707,7 +709,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
|
||||
$rule = $client->getContainer()->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:IgnoreOriginUserRule')
|
||||
->getRepository(IgnoreOriginUserRule::class)
|
||||
->findAll()[0];
|
||||
|
||||
$crawler = $client->request('GET', '/ignore-origin-user-rule/edit/' . $rule->getId());
|
||||
@ -723,7 +725,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
|
||||
$rule = $client->getContainer()->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:IgnoreOriginUserRule')
|
||||
->getRepository(IgnoreOriginUserRule::class)
|
||||
->findAll()[0];
|
||||
|
||||
$crawler = $client->request('GET', '/ignore-origin-user-rule/edit/' . $rule->getId());
|
||||
@ -776,13 +778,13 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('empty');
|
||||
$user->setEnabled(false);
|
||||
$em->persist($user);
|
||||
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('bob');
|
||||
$user->setEnabled(false);
|
||||
$em->persist($user);
|
||||
@ -798,13 +800,13 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertSame(403, $client->getResponse()->getStatusCode());
|
||||
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('empty');
|
||||
$user->setEnabled(true);
|
||||
$em->persist($user);
|
||||
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('bob');
|
||||
$user->setEnabled(true);
|
||||
$em->persist($user);
|
||||
@ -867,7 +869,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->createQueryBuilder('u')
|
||||
->where('u.username = :username')->setParameter('username', 'wallace')
|
||||
->getQuery()
|
||||
@ -878,7 +880,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$entries = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUser($loggedInUserId);
|
||||
|
||||
$this->assertEmpty($entries);
|
||||
@ -931,7 +933,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('flashes.config.notice.annotations_reset', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
|
||||
|
||||
$annotationsReset = $em
|
||||
->getRepository('WallabagAnnotationBundle:Annotation')
|
||||
->getRepository(Annotation::class)
|
||||
->findAnnotationsByPageId($entry->getId(), $user->getId());
|
||||
|
||||
$this->assertEmpty($annotationsReset, 'Annotations were reset');
|
||||
@ -947,7 +949,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('flashes.config.notice.tags_reset', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
|
||||
|
||||
$tagReset = $em
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->countAllTags($user->getId());
|
||||
|
||||
$this->assertSame(0, $tagReset, 'Tags were reset');
|
||||
@ -963,7 +965,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('flashes.config.notice.entries_reset', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
|
||||
|
||||
$entryReset = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->countAllEntriesByUser($user->getId());
|
||||
|
||||
$this->assertSame(0, $entryReset, 'Entries were reset');
|
||||
@ -1027,19 +1029,19 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('flashes.config.notice.archived_reset', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
|
||||
|
||||
$entryReset = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->countAllEntriesByUser($user->getId());
|
||||
|
||||
$this->assertSame(1, $entryReset, 'Entries were reset');
|
||||
|
||||
$tagReset = $em
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->countAllTags($user->getId());
|
||||
|
||||
$this->assertSame(1, $tagReset, 'Tags were reset');
|
||||
|
||||
$annotationsReset = $em
|
||||
->getRepository('WallabagAnnotationBundle:Annotation')
|
||||
->getRepository(Annotation::class)
|
||||
->findAnnotationsByPageId($annotationArchived->getId(), $user->getId());
|
||||
|
||||
$this->assertEmpty($annotationsReset, 'Annotations were reset');
|
||||
@ -1084,19 +1086,19 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('flashes.config.notice.entries_reset', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
|
||||
|
||||
$entryReset = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->countAllEntriesByUser($user->getId());
|
||||
|
||||
$this->assertSame(0, $entryReset, 'Entries were reset');
|
||||
|
||||
$tagReset = $em
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->countAllTags($user->getId());
|
||||
|
||||
$this->assertSame(0, $tagReset, 'Tags were reset');
|
||||
|
||||
$annotationsReset = $em
|
||||
->getRepository('WallabagAnnotationBundle:Annotation')
|
||||
->getRepository(Annotation::class)
|
||||
->findAnnotationsByPageId($entry->getId(), $user->getId());
|
||||
|
||||
$this->assertEmpty($annotationsReset, 'Annotations were reset');
|
||||
@ -1174,7 +1176,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
// restore user
|
||||
$em = $this->getEntityManager();
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$this->assertTrue($user->isEmailTwoFactor());
|
||||
@ -1201,7 +1203,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
// restore user
|
||||
$em = $this->getEntityManager();
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$this->assertFalse($user->isEmailTwoFactor());
|
||||
@ -1219,7 +1221,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
// restore user
|
||||
$em = $this->getEntityManager();
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$this->assertTrue($user->isGoogleTwoFactor());
|
||||
@ -1243,7 +1245,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
// restore user
|
||||
$em = $this->getEntityManager();
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$this->assertTrue($user->isGoogleTwoFactor());
|
||||
@ -1254,7 +1256,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$this->assertFalse($user->isGoogleTwoFactor());
|
||||
@ -1278,7 +1280,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
||||
// restore user
|
||||
$em = $this->getEntityManager();
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$this->assertEmpty($user->getGoogleAuthenticatorSecret());
|
||||
|
||||
@ -10,6 +10,7 @@ use Wallabag\CoreBundle\Entity\SiteCredential;
|
||||
use Wallabag\CoreBundle\Entity\Tag;
|
||||
use Wallabag\CoreBundle\Helper\ContentProxy;
|
||||
use Wallabag\CoreBundle\Helper\CryptoProxy;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
class EntryControllerTest extends WallabagCoreTestCase
|
||||
{
|
||||
@ -115,7 +116,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
$em = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager');
|
||||
$entry = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
|
||||
$em->remove($entry);
|
||||
$em->flush();
|
||||
@ -165,7 +166,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
|
||||
|
||||
$author = $content->getPublishedBy();
|
||||
@ -202,7 +203,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
|
||||
|
||||
$tags = $content->getTagsLabel();
|
||||
@ -239,7 +240,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||
|
||||
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
|
||||
@ -379,7 +380,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
$em = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager');
|
||||
$entry = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findOneByUrl($url);
|
||||
$tags = $entry->getTagsLabel();
|
||||
|
||||
@ -408,7 +409,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('/', $client->getResponse()->getTargetUrl());
|
||||
|
||||
$entry = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findOneByUrl($url);
|
||||
|
||||
$tags = $entry->getTagsLabel();
|
||||
@ -511,7 +512,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
|
||||
$entry = $this->getEntityManager()
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$this->assertNotEmpty($entry->getContent());
|
||||
@ -535,7 +536,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
// otherwise, retrieve the same entity will retrieve change from the previous request :0
|
||||
$this->getEntityManager()->clear();
|
||||
$newContent = $this->getEntityManager()
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$this->assertNotSame($client->getContainer()->getParameter('wallabag_core.fetching_error_message'), $newContent->getContent());
|
||||
@ -645,7 +646,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$this->assertSame(1, $res->isArchived());
|
||||
@ -668,7 +669,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findOneById($entry->getId());
|
||||
|
||||
$this->assertSame(1, $res->isStarred());
|
||||
@ -710,7 +711,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
// add a new content to be removed later
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUserName('admin');
|
||||
|
||||
$content = new Entry($user);
|
||||
@ -743,7 +744,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findOneByUsernameAndNotArchived('bob');
|
||||
|
||||
$client->request('GET', '/view/' . $content->getId());
|
||||
@ -949,7 +950,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$em = $this->getClient()->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUserName('admin');
|
||||
|
||||
$annotation = new Annotation($user);
|
||||
@ -1210,7 +1211,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
->get('doctrine.orm.entity_manager');
|
||||
|
||||
$entry = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||
|
||||
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry);
|
||||
@ -1250,7 +1251,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||
|
||||
$client->request('GET', '/delete/' . $content->getId());
|
||||
@ -1529,7 +1530,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||
|
||||
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
|
||||
@ -1580,7 +1581,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
$this->assertStringContainsString('flashes.entry.notice.entry_saved', $crawler->filter('body')->extract(['_text'])[0]);
|
||||
|
||||
$content = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||
|
||||
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
|
||||
@ -1629,7 +1630,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||
|
||||
$authors = $content->getPublishedBy();
|
||||
@ -1643,7 +1644,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$entry = $em->getRepository('WallabagCoreBundle:Entry')->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
|
||||
$entry = $em->getRepository(Entry::class)->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
|
||||
$tag = $entry->getTags()[0];
|
||||
|
||||
$crawler = $client->request('GET', '/view/' . $entry->getId());
|
||||
@ -1720,14 +1721,14 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry1->getId());
|
||||
|
||||
$this->assertSame(1, $res->isArchived());
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry2->getId());
|
||||
|
||||
$this->assertSame(1, $res->isArchived());
|
||||
@ -1742,14 +1743,14 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry1->getId());
|
||||
|
||||
$this->assertSame(1, $res->isStarred());
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry2->getId());
|
||||
|
||||
$this->assertSame(1, $res->isStarred());
|
||||
@ -1765,21 +1766,21 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry1->getId());
|
||||
|
||||
$this->assertContains('foo', $res->getTagsLabel());
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry2->getId());
|
||||
|
||||
$this->assertContains('foo', $res->getTagsLabel());
|
||||
|
||||
$res = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry3->getId());
|
||||
|
||||
$this->assertNotContains('foo', $res->getTagsLabel());
|
||||
|
||||
@ -50,7 +50,7 @@ class ExportControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findOneByUsernameAndNotArchived('admin');
|
||||
|
||||
$client->request('GET', '/export/' . $content->getId() . '.doc');
|
||||
@ -91,7 +91,7 @@ class ExportControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findOneByUsernameAndNotArchived('admin');
|
||||
|
||||
ob_start();
|
||||
@ -159,7 +159,7 @@ class ExportControllerTest extends WallabagCoreTestCase
|
||||
// to be sure results are the same
|
||||
$contentInDB = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->createQueryBuilder('e')
|
||||
->select('e, t')
|
||||
->leftJoin('e.user', 'u')
|
||||
@ -205,7 +205,7 @@ class ExportControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$contentInDB = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
|
||||
|
||||
ob_start();
|
||||
@ -279,7 +279,7 @@ class ExportControllerTest extends WallabagCoreTestCase
|
||||
// to be sure results are the same
|
||||
$contentInDB = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->createQueryBuilder('e')
|
||||
->leftJoin('e.user', 'u')
|
||||
->where('u.username = :username')->setParameter('username', 'admin')
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
namespace Tests\Wallabag\CoreBundle\Controller;
|
||||
|
||||
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
class FeedControllerTest extends WallabagCoreTestCase
|
||||
{
|
||||
@ -91,7 +93,7 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$config = $user->getConfig();
|
||||
@ -112,7 +114,7 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$config = $user->getConfig();
|
||||
@ -134,7 +136,7 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$config = $user->getConfig();
|
||||
@ -156,7 +158,7 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$config = $user->getConfig();
|
||||
@ -178,7 +180,7 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$config = $user->getConfig();
|
||||
@ -206,7 +208,7 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$client = $this->getClient();
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$config = $user->getConfig();
|
||||
@ -215,12 +217,12 @@ class FeedControllerTest extends WallabagCoreTestCase
|
||||
$em->persist($config);
|
||||
|
||||
$entry1 = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find(1)
|
||||
;
|
||||
|
||||
$entry4 = $em
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find(4)
|
||||
;
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
namespace Tests\Wallabag\CoreBundle\Controller;
|
||||
|
||||
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
class SecurityControllerTest extends WallabagCoreTestCase
|
||||
{
|
||||
@ -40,7 +41,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
$user->setEmailTwoFactor(true);
|
||||
$em->persist($user);
|
||||
@ -52,7 +53,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
|
||||
|
||||
// restore user
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
$user->setEmailTwoFactor(false);
|
||||
$em->persist($user);
|
||||
@ -73,7 +74,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
$user->setGoogleAuthenticatorSecret('26LDIHYGHNELOQEM');
|
||||
$em->persist($user);
|
||||
@ -85,7 +86,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
|
||||
|
||||
// restore user
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
$user->setGoogleAuthenticatorSecret(null);
|
||||
$em->persist($user);
|
||||
|
||||
@ -5,6 +5,7 @@ namespace Tests\Wallabag\CoreBundle\Controller;
|
||||
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
use Wallabag\CoreBundle\Entity\Tag;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
/**
|
||||
* @group Tag
|
||||
@ -77,7 +78,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$entry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId('http://0.0.0.0/entry2', $this->getLoggedInUserId());
|
||||
|
||||
$crawler = $client->request('GET', '/view/' . $entry->getId());
|
||||
@ -93,7 +94,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$newEntry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$tags = $newEntry->getTags()->toArray();
|
||||
@ -138,7 +139,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$tag = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findOneByLabel($this->tagName);
|
||||
|
||||
$this->assertNull($tag, $this->tagName . ' was removed because it begun an orphan tag');
|
||||
@ -170,23 +171,23 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$tag = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findOneByLabel($this->tagName);
|
||||
|
||||
$this->assertNull($tag, $this->tagName . ' was removed because it begun an orphan tag');
|
||||
|
||||
$user = $this->getEntityManager()
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->getRepository(User::class)
|
||||
->findOneByUserName('admin');
|
||||
|
||||
$entry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId('http://0.0.0.0/foo', $user->getId());
|
||||
|
||||
$entry2 = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId('http://0.0.0.0/bar', $user->getId());
|
||||
|
||||
$this->assertEmpty($entry->getTagsLabel());
|
||||
@ -205,7 +206,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$entry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getLoggedInUserId());
|
||||
|
||||
$tag->addEntry($entry);
|
||||
@ -216,7 +217,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$tag = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findOneByEntryAndTagLabel($entry, $this->tagName);
|
||||
|
||||
$crawler = $client->request('GET', '/tag/list/' . $tag->getSlug());
|
||||
@ -269,12 +270,12 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$freshEntry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$freshEntry2 = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry2->getId());
|
||||
|
||||
$tags = [];
|
||||
@ -293,7 +294,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$newTag = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findByLabel($newTagLabel);
|
||||
|
||||
$this->assertCount(1, $newTag, 'New tag exists.');
|
||||
@ -333,7 +334,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$freshEntry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$tags = [];
|
||||
@ -347,7 +348,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$newTag = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findByLabel($tagLabel);
|
||||
|
||||
$this->assertCount(1, $newTag);
|
||||
@ -388,7 +389,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$freshEntry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$tags = [];
|
||||
@ -402,12 +403,12 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$tagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findByLabel($tagLabel);
|
||||
|
||||
$newTagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findByLabel($newTagLabel);
|
||||
|
||||
$this->assertCount(0, $newTagFromRepo);
|
||||
@ -458,22 +459,22 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$freshEntry1 = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry1->getId());
|
||||
|
||||
$freshEntry2 = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry2->getId());
|
||||
|
||||
$tagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findByLabel($tagLabel);
|
||||
|
||||
$previousTagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->getRepository(Tag::class)
|
||||
->findByLabel($previousTagLabel);
|
||||
|
||||
$this->assertCount(1, $tagFromRepo);
|
||||
@ -516,7 +517,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$newEntry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->find($entry->getId());
|
||||
|
||||
$tags = $newEntry->getTags()->toArray();
|
||||
@ -549,7 +550,7 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||
|
||||
$entries = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->getRepository(Entry::class)
|
||||
->getBuilderForSearchByUser($this->getLoggedInUserId(), 'title', 'unread')
|
||||
->getQuery()->getResult();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user