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

Fix tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-05-23 10:44:03 +02:00
parent 2cd0f1879d
commit e15a2ffd92
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php
View File

@@ -75,6 +75,7 @@ class SessionManagerSubscriber implements EventSubscriberInterface
return; return;
} }
$moduleName = strtolower($pathInfo[1]); $moduleName = strtolower($pathInfo[1]);
if (!array_key_exists($moduleName, $modulesIds) ) { if (!array_key_exists($moduleName, $modulesIds) ) {
return; return;
} }
@@ -90,6 +91,11 @@ class SessionManagerSubscriber implements EventSubscriberInterface
if ($this->isFlashUploadRequest($event->getRequest())) { if ($this->isFlashUploadRequest($event->getRequest())) {
return; return;
} }
if ($event->getRequest()->query->has('LOG')) {
return;
}
// if we are already disconnected (ex. from another window), quit immediatly // if we are already disconnected (ex. from another window), quit immediatly
if (!($this->app['authentication']->isAuthenticated())) { if (!($this->app['authentication']->isAuthenticated())) {
if ($event->getRequest()->isXmlHttpRequest()) { if ($event->getRequest()->isXmlHttpRequest()) {

2
tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Application; namespace Alchemy\Tests\Phrasea\Application;
class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class LightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

6
tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/SessionManagerSubscriberTest.php
View File

@@ -74,9 +74,9 @@ class SessionManagerSubscriberTest extends \PhraseanetWebTestCaseAuthenticatedAb
$session->setUpdated(new \DateTime()); $session->setUpdated(new \DateTime());
$app['EM'] = $this->getMockBuilder('Doctrine\ORM\EntityManager')->disableOriginalConstructor()->getMock(); $app['EM'] = $this->getMockBuilder('Doctrine\ORM\EntityManager')->disableOriginalConstructor()->getMock();
$app['EM']->expects($this->once())->method('find')->with($this->equalTo('Entities\Session'))->will($this->returnValue($session)); $app['EM']->expects($this->exactly(2))->method('find')->with($this->equalTo('Entities\Session'))->will($this->returnValue($session));
$app['EM']->expects($this->exactly(2))->method('persist')->will($this->returnValue(null)); $app['EM']->expects($this->exactly(4))->method('persist')->will($this->returnValue(null));
$app['EM']->expects($this->once())->method('flush')->will($this->returnValue(null)); $app['EM']->expects($this->exactly(2))->method('flush')->will($this->returnValue(null));
$app['phraseanet.configuration']['session'] = array( $app['phraseanet.configuration']['session'] = array(
'idle' => 0, 'idle' => 0,

1
tests/classes/PhraseanetPHPUnitListener.php
View File

@@ -40,7 +40,6 @@ class PhraseanetPHPUnitListener implements PHPUnit_Framework_TestListener
public function startTest(PHPUnit_Framework_Test $test) public function startTest(PHPUnit_Framework_Test $test)
{ {
echo $test->getName() . "\n";
return; return;
} }