Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into notification/completion

Browse Source
This commit is contained in:
Mathieu Jaumotte
2022-01-05 11:15:49 +01:00
parent 40a457ba69 78cf817921
commit 1e0c62b09d
45 changed files with 474 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
View File

@@ -11,7 +11,6 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Tests\AccompanyingPeriod;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
@@ -45,13 +44,13 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
public function dataGenerateRandomAccompanyingCourse()
{
// Disabling this dataprovider to avoid having errors while running the test.
return yield from [];
$maxGenerated = 3;
$maxResults = $maxGenerated * 8;
self::bootKernel();
$em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
$center = $em->getRepository(Center::class)
->findOneBy(['name' => 'Center A']);
$qb = $em->createQueryBuilder();
$personIds = $qb
@@ -80,8 +79,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
while ($nbGenerated < $maxGenerated) {
$id = array_pop($personIds)['id'];
$person = $em->getRepository(Person::class)
->find($id);
$person = $em->getRepository(Person::class)->find($id);
$periods = $person->getAccompanyingPeriods();
yield [array_pop($personIds)['id'], $periods[array_rand($periods)]->getId()];
@@ -95,6 +93,10 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
*/
public function testRemoveUserWhenConfidential(int $periodId)
{
$this->markTestIncomplete(
'Marked as incomplete because of a problem in the dataprovider, at line 81.'
);
$period = self::$container->get(AccompanyingPeriodRepository::class)
->find($periodId);
$em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');

4
src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
View File

@@ -111,7 +111,7 @@ final class PersonAddressControllerTest extends WebTestCase
$crawler = $this->client->followRedirect();
$this->assertRegexp(
$this->assertMatchesRegularExpression(
'|/fr/person/[0-9]{1,}/address/list|',
$this->client->getHistory()->current()->getUri(),
'assert that the current page is on |/fr/person/[0-9]{1,}/address/list|'
@@ -169,7 +169,7 @@ final class PersonAddressControllerTest extends WebTestCase
$crawler = $this->client->followRedirect();
$this->assertRegexp(
$this->assertMatchesRegularExpression(
'|/fr/person/[0-9]{1,}/address/list|',
$this->client->getHistory()->current()->getUri(),
'assert that the current page is on |/fr/person/[0-9]{1,}/address/list|'

4
src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
View File

@@ -206,7 +206,7 @@ final class PersonControllerCreateTest extends WebTestCase
$client->followRedirect();
// visualize regexp here : http://jex.im/regulex/#!embed=false&flags=&re=%2Ffr%2Fperson%2F[1-9][0-9]*%2Fgeneral%2Fedit%24
$this->assertRegExp(
$this->assertMatchesRegularExpression(
'|/fr/person/[1-9][0-9]*/general/edit$|',
$client->getHistory()->current()->getUri(),
'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
@@ -259,7 +259,7 @@ final class PersonControllerCreateTest extends WebTestCase
'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
);
$client->followRedirect();
$this->assertRegExp(
$this->assertMatchesRegularExpression(
'|/fr/person/[1-9][0-9]*/general/edit$|',
$client->getHistory()->current()->getUri(),
'a valid form redirect to url /{_locale}/person/{personId}/general/edit'

62
src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
View File

@@ -26,19 +26,19 @@ final class PersonSearchTest extends WebTestCase
$this->markTestSkipped('skipped until adapted to new fixtures');
$crawlerSpecial = $this->generateCrawlerForSearch('@person manço');
$this->assertRegExp('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
$crawlerNoSpecial = $this->generateCrawlerForSearch('@person manco');
$this->assertRegExp('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
$crawlerSpecial = $this->generateCrawlerForSearch('@person Étienne');
$this->assertRegExp('/Étienne/', $crawlerSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Étienne/', $crawlerSpecial->filter('.list-with-period')->text());
$crawlerNoSpecial = $this->generateCrawlerForSearch('@person etienne');
$this->assertRegExp('/Étienne/', $crawlerNoSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Étienne/', $crawlerNoSpecial->filter('.list-with-period')->text());
}
public function testExpected()
@@ -49,7 +49,7 @@ final class PersonSearchTest extends WebTestCase
'q' => '@person Depardieu',
]);
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testExpectedNamed()
@@ -60,79 +60,79 @@ final class PersonSearchTest extends WebTestCase
'q' => '@person Depardieu', 'name' => 'person_regular',
]);
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testLastNameAccentued()
{
$crawlerSpecial = $this->generateCrawlerForSearch('@person lastname:manço');
$this->assertRegExp('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
$crawlerNoSpecial = $this->generateCrawlerForSearch('@person lastname:manco');
$this->assertRegExp('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
}
public function testSearchBirthdate()
{
$crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27');
$this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
$this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Bart/', $crawler->filter('.list-with-period')->text());
}
public function testSearchByFirstName()
{
$crawler = $this->generateCrawlerForSearch('@person firstname:Jean');
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchByFirstNameAccented()
{
$crawlerSpecial = $this->generateCrawlerForSearch('@person firstname:Gérard');
$this->assertRegExp('/Gérard/', $crawlerSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Gérard/', $crawlerSpecial->filter('.list-with-period')->text());
$crawlerNoSpecial = $this->generateCrawlerForSearch('@person firstname:Gerard');
$this->assertRegExp('/Gérard/', $crawlerNoSpecial->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Gérard/', $crawlerNoSpecial->filter('.list-with-period')->text());
}
public function testSearchByFirstNameLower()
{
$crawler = $this->generateCrawlerForSearch('@person firstname:Gérard');
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchByFirstNameLower2()
{
$crawler = $this->generateCrawlerForSearch('@person firstname:jean');
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchByFirstNamePartim()
{
$crawler = $this->generateCrawlerForSearch('@person firstname:Ger');
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchByFirstNamePartim2()
{
$crawler = $this->generateCrawlerForSearch('@person firstname:ean');
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchByLastName()
{
$crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu');
$this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchCombineBirthdateAndLastName()
@@ -140,8 +140,8 @@ final class PersonSearchTest extends WebTestCase
$this->markTestSkipped('skipped until adapted to new fixtures');
$crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27 lastname:(Van Snick)');
$this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text());
$this->assertNotRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Bart/', $crawler->filter('.list-with-period')->text());
$this->assertDoesNotMatchRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
}
public function testSearchCombineGenderAndLastName()
@@ -149,8 +149,8 @@ final class PersonSearchTest extends WebTestCase
$this->markTestSkipped('skipped until adapted to new fixtures');
$crawler = $this->generateCrawlerForSearch('@person gender:woman lastname:(Depardieu)');
$this->assertRegExp('/Charline/', $crawler->filter('.list-with-period')->text());
$this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Charline/', $crawler->filter('.list-with-period')->text());
$this->assertDoesNotMatchRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
}
public function testSearchCombineLastnameAndFirstName()
@@ -158,9 +158,9 @@ final class PersonSearchTest extends WebTestCase
$this->markTestSkipped('skipped until adapted to new fixtures');
$crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu firstname:Jean');
$this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Depardieu/', $crawler->filter('.list-with-period')->text());
//if this is a AND clause, Jean Depardieu should not appears
$this->assertNotRegExp(
$this->assertDoesNotMatchRegularExpression(
'/Gérard/',
$crawler->filter('.list-with-period')->text(),
'assert clause firstname and nationality are AND'
@@ -172,9 +172,9 @@ final class PersonSearchTest extends WebTestCase
$this->markTestSkipped('skipped until adapted to new fixtures');
$crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu nationality:RU');
$this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
//if this is a AND clause, Jean Depardieu should not appears
$this->assertNotRegExp(
$this->assertDoesNotMatchRegularExpression(
'/Jean/',
$crawler->filter('.list-with-period')->text(),
'assert clause firstname and nationality are AND'
@@ -186,9 +186,9 @@ final class PersonSearchTest extends WebTestCase
$this->markTestSkipped('skipped until adapted to new fixtures');
$crawler = $this->generateCrawlerForSearch('@person cha dep');
$this->assertRegExp('/Charline/', $crawler->filter('.list-with-period')->text());
$this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
$this->assertNotRegExp('/Jean/', $crawler->filter('.list-with-period')->text());
$this->assertMatchesRegularExpression('/Charline/', $crawler->filter('.list-with-period')->text());
$this->assertDoesNotMatchRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
$this->assertDoesNotMatchRegularExpression('/Jean/', $crawler->filter('.list-with-period')->text());
}
/**
@@ -199,12 +199,12 @@ final class PersonSearchTest extends WebTestCase
$crawlerCanSee = $this->generateCrawlerForSearch('Gérard', 'center a_social');
$crawlerCannotSee = $this->generateCrawlerForSearch('Gérard', 'center b_social');
$this->assertRegExp(
$this->assertMatchesRegularExpression(
'/DEPARDIEU/',
$crawlerCanSee->text(),
'center a_social may see "Depardieu" in center a'
);
$this->assertNotRegExp(
$this->assertDoesNotMatchRegularExpression(
'/DEPARDIEU/',
$crawlerCannotSee->text(),
'center b_social may not see "Depardieu" in center b'