hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement feed formatters, fixed tests and prod controllers

Browse Source
This commit is contained in:
Andrey
2013-06-11 11:16:52 +02:00
parent affdfe7a0a
commit d303a383e6
28 changed files with 1803 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/classes/PhraseanetPHPUnitAbstract.php
View File

@@ -331,7 +331,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*
* @return \Entities\Feed
*/
protected function insertOneFeed(\User_Adapter $user, $title = null)
protected function insertOneFeed(\User_Adapter $user, $title = null, $public = null)
{
try {
$feedFixture = new PhraseaFixture\Feed\LoadOneFeed();
@@ -341,6 +341,10 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$feedFixture->setTitle($title);
}
if ($public !== null) {
$feedFixture->setPublic($public);
}
$loader = new Loader();
$loader->addFixture($feedFixture);
@@ -397,7 +401,10 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$token->setFeed($feed);
$token->setUsrId($user->get_id());
$feed->addToken($token);
self::$DI['app']['EM']->persist($token);
self::$DI['app']['EM']->persist($feed);
self::$DI['app']['EM']->flush();
} catch (\Exception $e) {
$this->fail('Fail to load one FeedToken : ' . $e->getMessage());