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

Fix unit tests

Browse Source
This commit is contained in:
Romain Neutron
2013-04-18 17:11:35 +02:00
parent ed4d8f2d68
commit 5928cb71ae
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Application.php
View File

@@ -326,6 +326,7 @@ class Application extends SilexApplication
// symfony locale is set on 16 priority, let's override it
$this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'addLocale'), 17);
$this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'addLocale'), 15);
$this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'removePhraseanetLocale'), 14);
$this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'initSession'), 254);
$this['dispatcher']->addListener(KernelEvents::RESPONSE, array($this, 'addUTF8Charset'), -128);
@@ -426,6 +427,13 @@ class Application extends SilexApplication
$event->setResponse($response);
}
public function removePhraseanetLocale(GetResponseEvent $event)
{
if (isset($this['phraseanet.locale'])) {
unset($this['phraseanet.locale']);
}
}
public function addLocale(GetResponseEvent $event)
{
if (isset($this['phraseanet.locale'])) {

2
templates/web/common/thumbnail.html.twig
View File

@@ -60,7 +60,7 @@
<script type="text/javascript">
flowplayer("preview{{random}}",
{src:"/include/jslibs/flowplayer/flowplayer-3.2.12.swf", wmode: "transparent"},
{clip:{url:"{{url|urlencode}}",autoPlay: true,autoBuffering:true,provider: "h264streaming",scaling:"fit"},
{clip:{url:"{{url|url_encode}}",autoPlay: true,autoBuffering:true,provider: "h264streaming",scaling:"fit"},
onError:function(code,message){getNewVideoToken({{thumbnail.get_sbas_id() ~'_'~thumbnail.get_record_id()}}, this);},
plugins: {h264streaming: {url: "/include/jslibs/flowplayer/flowplayer.pseudostreaming-3.2.9.swf"}}
});

15
tests/Alchemy/Tests/Phrasea/Border/FileTest.php
View File

@@ -194,18 +194,23 @@ class FileTest extends \PhraseanetPHPUnitAbstract
{
$media = self::$DI['app']['mediavorus']->guess($this->filename);
$file1 = new File(self::$DI['app'], $media, self::$DI['collection']);
$file2 = File::buildFromPathfile($this->filename, self::$DI['collection'], self::$DI['app']);
$this->assertEquals($file1, $file2);
$this->assertBorderFileEquals($file1, $file2);
$media = self::$DI['app']['mediavorus']->guess($this->filename);
$file3 = new File(self::$DI['app'], $media, self::$DI['collection'], 'coco lapin');
$file4 = File::buildFromPathfile($this->filename, self::$DI['collection'], self::$DI['app'], 'coco lapin');
$this->assertEquals($file3, $file4);
$this->assertNotEquals($file1, $file4);
$this->assertBorderFileEquals($file3, $file4);
}
private function assertBorderFileEquals($file1, $file2)
{
$this->assertEquals($file1->getType(), $file2->getType());
$this->assertEquals($file1->getCollection(), $file2->getCollection());
$this->assertEquals($file1->getMD5(), $file2->getMD5());
$this->assertEquals($file1->getOriginalName(), $file2->getOriginalName());
}
/**