{% spaceless %}
{% if person.countryOfBirth is not null %}
@@ -96,6 +99,7 @@ This view should receive those arguments:
{{ 'Unknown country of birth'|trans }}
{% endif %}
{% endspaceless %}
+ {%- endif -%}
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
@@ -106,10 +110,12 @@ This view should receive those arguments:
+ {%- if chill_person.fields.nationality == 'visible' or chill_person.fields.spoken_languages == 'visible'-%}
{{ 'Administrative information'|trans|upper }}
+ {%- if chill_person.fields.nationality == 'visible' -%}
{{ 'Nationality'|trans }} :
@@ -120,6 +126,8 @@ This view should receive those arguments:
{% endif %}
{{ 'Spoken languages'|trans|upper}} :
{% if person.spokenLanguages|length == 0 %}
@@ -87,7 +90,8 @@
{{ lang.name|localize_translatable_string }}{% if not loop.last %},{% endif %}
{% endfor %}
{% endif %}
-
+
+ {%- endif -%}
{% endblock %}
diff --git a/Tests/Controller/PersonControllerUpdateTest.php b/Tests/Controller/PersonControllerUpdateTest.php
index 9429e4e3e..b7087024d 100644
--- a/Tests/Controller/PersonControllerUpdateTest.php
+++ b/Tests/Controller/PersonControllerUpdateTest.php
@@ -96,6 +96,24 @@ class PersonControllerUpdateTest extends WebTestCase
"The person edit form is accessible");
}
+ /**
+ * Test the configurable fields are present
+ *
+ * @group configurable_fields
+ */
+ public function testHiddenFielsArePresent()
+ {
+ $crawler = $this->client->request('GET', $this->editUrl);
+
+ $configurables = array('placeOfBirth', 'phonenumber', 'email',
+ 'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus');
+ $form = $crawler->selectButton('Submit')->form(); //;
+
+ foreach($configurables as $key) {
+ $this->assertTrue($form->has('chill_personbundle_person['.$key.']'));
+ }
+ }
+
/**
* Test if the edit page of a given person is not accessible for a user
* of another center of the person
diff --git a/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
new file mode 100644
index 000000000..7d374a3a7
--- /dev/null
+++ b/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -0,0 +1,211 @@
+
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+namespace Chill\PersonBundle\Tests\Controller;
+
+//ini_set('memory_limit', '-1');
+
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * Test the edition of persons
+ *
+ * As I am logged in as "center a_social"
+ *
+ * @author Julien Fastré
+ */
+class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
+{
+ /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
+ private $em;
+
+ /** @var Person The person on which the test is executed */
+ private $person;
+
+ /** @var string The url using for editing the person's information */
+ private $editUrl;
+
+ /** @var string The url using for seeing the person's information */
+ private $viewUrl;
+
+ /**
+ * Prepare client and create a random person
+ */
+ public function setUp()
+ {
+ static::bootKernel(array('environment' => 'test_with_hidden_fields'));
+
+ $this->em = static::$kernel->getContainer()
+ ->get('doctrine.orm.entity_manager');
+
+ $center = $this->em->getRepository('ChillMainBundle:Center')
+ ->findOneBy(array('name' => 'Center A'));
+
+ $this->person = (new Person())
+ ->setLastName("My Beloved")
+ ->setFirstName("Jesus")
+ ->setCenter($center)
+ ->setGender(Person::MALE_GENDER);
+
+ $this->em->persist($this->person);
+ $this->em->flush();
+
+ $this->editUrl = '/en/person/'.$this->person->getId().'/general/edit';
+ $this->viewUrl = '/en/person/'.$this->person->getId().'/general';
+
+ $this->client = static::createClient(
+ array(
+ 'environment' => 'test_with_hidden_fields'
+ ),
+ array(
+ 'PHP_AUTH_USER' => 'center a_social',
+ 'PHP_AUTH_PW' => 'password',
+ )
+ );
+ }
+
+ /**
+ * Reload the person from the db
+ */
+ protected function refreshPerson()
+ {
+ $this->person = $this->em->getRepository('ChillPersonBundle:Person')
+ ->find($this->person->getId());
+ }
+
+ /**
+ * Test the edit page are accessible
+ */
+ public function testEditPageIsSuccessful()
+ {
+ $this->client->request('GET', $this->editUrl);
+ $this->assertTrue($this->client->getResponse()->isSuccessful(),
+ "The person edit form is accessible");
+ }
+
+ /**
+ * Test the configurable fields are absent
+ *
+ * @group configurable_fields
+ */
+ public function testHiddenFielsAreAbsent()
+ {
+ $crawler = $this->client->request('GET', $this->editUrl);
+
+ $configurables = array('placeOfBirth', 'phonenumber', 'email',
+ 'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus');
+ $form = $crawler->selectButton('Submit')->form(); //;
+
+ foreach($configurables as $key) {
+ $this->assertFalse($form->has('chill_personbundle_person['.$key.']'));
+ }
+ }
+
+ /**
+ * Test the edition of a field
+ *
+ * Given I fill the field with $value
+ * And I submit the form
+ * Then I am redirected to the 'general' page
+ * And the person is updated in the db
+ *
+ * @dataProvider validTextFieldsProvider
+ * @param string $field
+ * @param string $value
+ * @param \Closure $callback
+ */
+ public function testEditTextField($field, $value, \Closure $callback)
+ {
+ $crawler = $this->client->request('GET', $this->editUrl);
+
+ $form = $crawler->selectButton('Submit')
+ ->form();
+ //transform countries into value if needed
+ switch ($field) {
+ case 'nationality':
+ case 'countryOfBirth':
+ if ($value !== NULL) {
+ $country = $this->em->getRepository('ChillMainBundle:Country')
+ ->findOneByCountryCode($value);
+ $transformedValue = $country->getId();
+ } else {
+ $transformedValue = NULL;
+ }
+ break;
+ default:
+ $transformedValue = $value;
+ }
+
+ $form->get('chill_personbundle_person['.$field. ']')
+ ->setValue($transformedValue);
+
+ $this->client->submit($form);
+ $this->refreshPerson();
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->viewUrl),
+ 'the page is redirected to general view');
+ $this->assertEquals($value, $callback($this->person),
+ 'the value '.$field.' is updated in db');
+
+ $crawler = $this->client->followRedirect();
+ $this->assertGreaterThan(0, $crawler->filter('.success')->count(),
+ 'a element .success is shown');
+
+ if($field == 'birthdate' or $field == 'memo' or $field == 'countryOfBirth' or $field == 'nationality'
+ or $field == 'gender') {
+ // we do not perform test on the web page contents.
+ } else {
+ $this->assertGreaterThan(0, $crawler->filter('html:contains("'.$value.'")')->count());
+ }
+ }
+
+ /**
+ * provide valid values to test, with field name and
+ * a function to find the value back from person entity
+ *
+ * @return mixed[]
+ */
+ public function validTextFieldsProvider()
+ {
+ return array(
+ ['firstName', 'random Value', function(Person $person) { return $person->getFirstName(); } ],
+ ['lastName' , 'random Value', function(Person $person) { return $person->getLastName(); } ],
+ ['birthdate', '15-12-1980', function(Person $person) { return $person->getBirthdate()->format('d-m-Y'); }],
+ ['memo', 'jfkdlmq jkfldmsq jkmfdsq', function(Person $person) { return $person->getMemo(); }],
+ ['birthdate', '', function(Person $person) { return $person->getBirthdate(); }],
+ ['gender', Person::FEMALE_GENDER, function(Person $person) { return $person->getGender(); }],
+ );
+ }
+
+ public function tearDown()
+ {
+ $this->refreshPerson();
+ $this->em->remove($this->person);
+ $this->em->flush();
+ }
+
+ private function getVeryLongText()
+ {
+ return <<assertGreaterThan(0, $crawler->filter('html:contains("Tested Person")')->count());
$this->assertGreaterThan(0, $crawler->filter('html:contains("Réginald")')->count());
+ $this->assertContains('Email addresses', $crawler->text());
+ $this->assertContains('Phonenumber', $crawler->text());
+ $this->assertContains('Langues parlées', $crawler->text());
+ $this->assertContains(/* Etat */ 'civil', $crawler->text());
}
/**
diff --git a/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
new file mode 100644
index 000000000..2ace5c1da
--- /dev/null
+++ b/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
@@ -0,0 +1,107 @@
+
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+namespace Chill\PersonBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Chill\PersonBundle\Entity\Person;
+
+/**
+ * @author Julien Fastré
+ * @author Marc Ducobu
+ */
+class PersonControllerViewTestWithHiddenFields extends WebTestCase
+{
+ /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
+ private $em;
+
+ /** @var Person A person used on which to run the test */
+ private $person;
+
+ /** @var String The url to view the person details */
+ private $viewUrl;
+
+ public function setUp()
+ {
+ static::bootKernel(array('environment' => 'test_with_hidden_fields'));
+
+ $this->em = static::$kernel->getContainer()
+ ->get('doctrine.orm.entity_manager');
+
+ $center = $this->em->getRepository('ChillMainBundle:Center')
+ ->findOneBy(array('name' => 'Center A'));
+
+ $this->person = (new Person())
+ ->setLastName("Tested Person")
+ ->setFirstName("Réginald")
+ ->setCenter($center)
+ ->setGender(Person::MALE_GENDER);
+
+ $this->em->persist($this->person);
+ $this->em->flush();
+
+ $this->viewUrl = '/en/person/'.$this->person->getId().'/general';
+ }
+
+ /**
+ * Test if the view page is accessible
+ *
+ * @group configurable_fields
+ */
+ public function testViewPerson()
+ {
+ $client = static::createClient(
+ array('environment' => 'test_with_hidden_fields'),
+ array(
+ 'PHP_AUTH_USER' => 'center a_social',
+ 'PHP_AUTH_PW' => 'password',
+ 'HTTP_ACCEPT_LANGUAGE' => 'fr'
+ )
+ );
+
+ $crawler = $client->request('GET', $this->viewUrl);
+ $response = $client->getResponse();
+
+ $this->assertTrue($response->isSuccessful());
+
+ $this->assertGreaterThan(0, $crawler->filter('html:contains("Tested Person")')->count());
+ $this->assertGreaterThan(0, $crawler->filter('html:contains("Réginald")')->count());
+ $this->assertNotContains('Email addresses', $crawler->text());
+ $this->assertNotContains('Phonenumber', $crawler->text());
+ $this->assertNotContains('Langues parlées', $crawler->text());
+ $this->assertNotContains(/* Etat */ 'civil', $crawler->text());
+ }
+
+ /**
+ * Reload the person from the db
+ */
+ protected function refreshPerson()
+ {
+ $this->person = $this->em->getRepository('ChillPersonBundle:Person')
+ ->find($this->person->getId());
+ }
+
+ public function tearDown()
+ {
+ $this->refreshPerson();
+ $this->em->remove($this->person);
+ $this->em->flush();
+ }
+
+}
diff --git a/Tests/Fixtures/App/app/config/config_test_with_hidden_fields.yml b/Tests/Fixtures/App/app/config/config_test_with_hidden_fields.yml
new file mode 100644
index 000000000..e11599661
--- /dev/null
+++ b/Tests/Fixtures/App/app/config/config_test_with_hidden_fields.yml
@@ -0,0 +1,18 @@
+# config/config_test.yml
+imports:
+ - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+ test: ~
+ session:
+ storage_id: session.storage.filesystem
+
+chill_person:
+ person_fields:
+ nationality: hidden
+ email: hidden
+ place_of_birth: hidden
+ phonenumber: hidden
+ country_of_birth: hidden
+ marital_status: hidden
+ spoken_languages: hidden
\ No newline at end of file