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

Fix unit tests

Browse Source
This commit is contained in:
Romain Neutron
2013-01-29 19:35:51 +01:00
parent 00ea1c4c25
commit 74ce48fe45
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php
View File

@@ -183,7 +183,7 @@ class Dashboard implements ControllerProviderInterface
$app->abort(400, 'Bad request missing email parameter'); $app->abort(400, 'Bad request missing email parameter');
}; };
if (\Swift_Validate::email($request->request->get('email'))) { if (!\Swift_Validate::email($request->request->get('email'))) {
$app->abort(400, 'Bad request missing email parameter'); $app->abort(400, 'Bad request missing email parameter');
}; };

2
lib/Alchemy/Phrasea/Controller/Root/Account.php
View File

@@ -309,6 +309,8 @@ class Account implements ControllerProviderInterface
$mail->setButtonUrl($url); $mail->setButtonUrl($url);
$mail->setExpiration($date); $mail->setExpiration($date);
$app['notification.deliverer']->deliver($mail);
return $app->redirect('/account/reset-email/?update=mail-send'); return $app->redirect('/account/reset-email/?update=mail-send');
} }

2
lib/classes/caption/Field/Value.php
View File

@@ -86,7 +86,7 @@ class caption_Field_Value implements cache_cacheableInterface
$this->VocabularyId = $datas['vocabularyId']; $this->VocabularyId = $datas['vocabularyId'];
return $this; return $this;
} catch (\InvalidArgumentException $e) { } catch (\Exception $e) {
} }

16
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminDashboardTest.php
View File

@@ -57,13 +57,27 @@ class AdminDashboardTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailTest'); $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailTest');
self::$DI['client']->request('POST', '/admin/dashboard/send-mail-test/', array( self::$DI['client']->request('POST', '/admin/dashboard/send-mail-test/', array(
'email' => self::$DI['user']->get_email() 'email' => 'user-test@phraseanet.com'
)); ));
$this->assertTrue(self::$DI['client']->getResponse()->isRedirect()); $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
$this->assertRegexp('/email=/', self::$DI['client']->getResponse()->headers->get('location')); $this->assertRegexp('/email=/', self::$DI['client']->getResponse()->headers->get('location'));
} }
/**
* @covers \Alchemy\Phrasea\Controller\Admin\Dashboard::sendMail
*/
public function testSendMailTestWithWrongMail()
{
$this->setAdmin(true);
self::$DI['client']->request('POST', '/admin/dashboard/send-mail-test/', array(
'email' => 'user-test-phraseanet.com'
));
$this->assertEquals(400, self::$DI['client']->getResponse()->getStatusCode());
}
/** /**
* @covers \Alchemy\Phrasea\Controller\Admin\Dashboard::sendMail * @covers \Alchemy\Phrasea\Controller\Admin\Dashboard::sendMail
*/ */

2
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
View File

@@ -181,7 +181,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertTrue($response->isRedirect()); $this->assertTrue($response->isRedirect());
$this->assertEquals('/login/forgot-password/?error=invalidmail', $response->headers->get('location')); $this->assertEquals('/login/forgot-password/?error=noaccount', $response->headers->get('location'));
} }
/** /**