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

Fix phpunit tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-06-11 17:53:06 +02:00
parent 12c7e7e3bb
commit 5fe2f4d554
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertTrue($response->isOk()); $this->assertTrue($response->isOk());
$this->assertAngularFlashMessage($crawler, $type, 1, $message); $this->assertFlashMessage($crawler, $type, 1, $message);
} }
/** /**
@@ -215,7 +215,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertFalse($response->isRedirect()); $this->assertFalse($response->isRedirect());
$this->assertAngularFlashMessage($crawler, 'error', 1); $this->assertFlashMessage($crawler, 'error', 1);
} }
/** /**
@@ -254,7 +254,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertFalse($response->isRedirect()); $this->assertFalse($response->isRedirect());
$this->assertAngularFlashMessage($crawler, 'error', 1); $this->assertFlashMessage($crawler, 'error', 1);
} }
public function testRenewPasswordBadToken() public function testRenewPasswordBadToken()
@@ -353,7 +353,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertTrue(self::$DI['client']->getResponse()->isOk());
$this->assertAngularFlashMessage($crawler, $type, 1, $message); $this->assertFlashMessage($crawler, $type, 1, $message);
} }
public function testForgotPasswordGet() public function testForgotPasswordGet()
@@ -399,7 +399,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertFalse($response->isRedirect()); $this->assertFalse($response->isRedirect());
$this->assertAngularFlashMessage($crawler, 'error', 1); $this->assertFlashMessage($crawler, 'error', 1);
} }
public function testForgotPasswordSubmission() public function testForgotPasswordSubmission()
@@ -430,7 +430,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertTrue($response->isOk()); $this->assertTrue($response->isOk());
$this->assertAngularFlashMessage($crawler, $type, 1, $message); $this->assertFlashMessage($crawler, $type, 1, $message);
} }
public function testGetRegisterWithRegisterIdBindDataToForm() public function testGetRegisterWithRegisterIdBindDataToForm()
@@ -510,7 +510,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$crawler = self::$DI['client']->request('POST', '/login/register-classic/', $parameters); $crawler = self::$DI['client']->request('POST', '/login/register-classic/', $parameters);
$this->assertFalse(self::$DI['client']->getResponse()->isRedirect()); $this->assertFalse(self::$DI['client']->getResponse()->isRedirect());
$this->assertFormOrAngularError($crawler, $errors); $this->assertFormOrFlashError($crawler, $errors);
} }
public function testPostRegisterWithoutParams() public function testPostRegisterWithoutParams()
@@ -519,7 +519,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$crawler = self::$DI['client']->request('POST', '/login/register-classic/'); $crawler = self::$DI['client']->request('POST', '/login/register-classic/');
$this->assertFalse(self::$DI['client']->getResponse()->isRedirect()); $this->assertFalse(self::$DI['client']->getResponse()->isRedirect());
$this->assertFormOrAngularError($crawler, 9); $this->assertFormOrFlashError($crawler, 9);
} }
public function provideInvalidRegistrationData() public function provideInvalidRegistrationData()

17
tests/classes/PhraseanetWebTestCaseAuthenticatedAbstract.php
View File

@@ -164,10 +164,10 @@ abstract class PhraseanetWebTestCaseAuthenticatedAbstract extends PhraseanetPHPU
); );
} }
protected function assertFormOrAngularError(Crawler $crawler, $quantity) protected function assertFormOrFlashError(Crawler $crawler, $quantity)
{ {
$total = $crawler->filter('form div:not(div[ng-show]) > div.popover.field-error')->count(); $total = $crawler->filter('form div:not(div[ng-show]) > div.popover.field-error')->count();
$total += $crawler->filter('phraseanet-flash[type="error"]')->count(); $total += $crawler->filter('.alert')->count();
$this->assertEquals($quantity, $total); $this->assertEquals($quantity, $total);
} }
@@ -190,19 +190,6 @@ abstract class PhraseanetWebTestCaseAuthenticatedAbstract extends PhraseanetPHPU
} }
} }
protected function assertAngularFlashMessage(Crawler $crawler, $flashType, $quantity, $message = null, $offset = 0)
{
if (!preg_match('/[a-zA-Z]+/', $flashType)) {
$this->fail(sprintf('FlashType must be in the form of [a-zA-Z]+, %s given', $flashType));
}
$this->assertEquals($quantity, $crawler->filter('phraseanet-flash[type="'.$flashType.'"]')->count());
if (null !== $message) {
$this->assertEquals($message, $crawler->filter('phraseanet-flash[type="'.$flashType.'"]')->eq($offset)->text());
}
}
protected function assertFlashMessagePopulated(Application $app, $flashType, $quantity) protected function assertFlashMessagePopulated(Application $app, $flashType, $quantity)
{ {
if (!preg_match('/[a-zA-Z]+/', $flashType)) { if (!preg_match('/[a-zA-Z]+/', $flashType)) {