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

Fix unit tests

Browse Source
This commit is contained in:
Romain Neutron
2013-01-28 22:47:25 +01:00
parent aa172ac9fd
commit 8017f4126b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,7 @@ use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpFoundation\Response;
class Application extends SilexApplication class Application extends SilexApplication
{ {
@@ -523,7 +524,7 @@ class Application extends SilexApplication
public function bindRoutes() public function bindRoutes()
{ {
$this->get('/', function(PhraseaApplication $app) { $this->get('/', function(Application $app) {
if ($app['browser']->isMobile()) { if ($app['browser']->isMobile()) {
return $app->redirect("/login/?redirect=lightbox"); return $app->redirect("/login/?redirect=lightbox");
} elseif ($app['browser']->isNewGeneration()) { } elseif ($app['browser']->isNewGeneration()) {
@@ -533,7 +534,7 @@ class Application extends SilexApplication
} }
})->bind('root'); })->bind('root');
$this->get('/robots.txt', function(PhraseaApplication $app) { $this->get('/robots.txt', function(Application $app) {
if ($app['phraseanet.registry']->get('GV_allow_search_engine') === true) { if ($app['phraseanet.registry']->get('GV_allow_search_engine') === true) {
$buffer = "User-Agent: *\n" . "Allow: /\n"; $buffer = "User-Agent: *\n" . "Allow: /\n";

6
tests/classes/PhraseanetPHPUnitAbstract.php
View File

@@ -127,12 +127,12 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
return $browser; return $browser;
})); }));
$app['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') $app['notification.deliverer'] = $phpunit->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$app['notification.deliverer']->expects($this->any()) $app['notification.deliverer']->expects($phpunit->any())
->method('deliver') ->method('deliver')
->will($this->returnCallback(function() use ($phpunit){ ->will($phpunit->returnCallback(function() use ($phpunit){
$phpunit->fail('Notification deliverer must be mocked'); $phpunit->fail('Notification deliverer must be mocked');
})); }));