pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix findOneByUrl side effect in tests

Browse Source 
Fix #1566
This commit is contained in:
Jeremy Benoist
2016-01-15 15:28:22 +01:00
parent 790573d458
commit 7883367246
8 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/ImportBundle/Import/PocketImport.php
View File

@ -214,7 +214,7 @@ class PocketImport implements ImportInterface
$existingEntry = $this->em
->getRepository('WallabagCoreBundle:Entry')
->existByUrlAndUserId($url, $this->user->getId());
->findByUrlAndUserId($url, $this->user->getId());
if (false !== $existingEntry) {
++$this->skippedEntries;

2
src/Wallabag/ImportBundle/Import/WallabagV1Import.php
View File

@ -127,7 +127,7 @@ class WallabagV1Import implements ImportInterface
foreach ($entries as $importedEntry) {
$existingEntry = $this->em
->getRepository('WallabagCoreBundle:Entry')
->existByUrlAndUserId($importedEntry['url'], $this->user->getId());
->findByUrlAndUserId($importedEntry['url'], $this->user->getId());
if (false !== $existingEntry) {
++$this->skippedEntries;

2
src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
View File

@ -248,7 +248,7 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
->getMock();
$entryRepo->expects($this->exactly(2))
->method('existByUrlAndUserId')
->method('findByUrlAndUserId')
->will($this->onConsecutiveCalls(false, true));
$tag = $this->getMockBuilder('Wallabag\CoreBundle\Entity\Tag')

2
src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
View File

@ -53,7 +53,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
->getMock();
$entryRepo->expects($this->exactly(3))
->method('existByUrlAndUserId')
->method('findByUrlAndUserId')
->will($this->onConsecutiveCalls(false, true, false));
$this->em