diff --git a/VERSIONS_HOTLINE/73058 b/VERSIONS_HOTLINE/73058 new file mode 100644 index 0000000000000000000000000000000000000000..e6a28f444ddc6562fb020c7e3e9111b798d86125 --- /dev/null +++ b/VERSIONS_HOTLINE/73058 @@ -0,0 +1 @@ + - ticket #73058 : Carte réseau : affiche les horaires renseignés même si le texte d'horaire par défaut est composé seulement d'espaces. \ No newline at end of file diff --git a/library/Class/Ouverture/Visitor.php b/library/Class/Ouverture/Visitor.php index 7efe29157412397174d0fc0e273e062e8b6515ea..7c0d9eed46e678c7bde87d837be06cf209609905 100644 --- a/library/Class/Ouverture/Visitor.php +++ b/library/Class/Ouverture/Visitor.php @@ -44,7 +44,7 @@ class Class_Ouverture_Visitor { public function visitSimple($content) { - $this->_content = $this->_escapeInfo($content); + $this->_content = trim($this->_escapeInfo($content)); return $this; } diff --git a/tests/application/modules/opac/controllers/BibControllerTest.php b/tests/application/modules/opac/controllers/BibControllerTest.php index 76dc7a430d4785de9831d7c603f9c802de44fd99..c8592ad985cb6f8ecf6376a25c0c3bf02fdb2083 100644 --- a/tests/application/modules/opac/controllers/BibControllerTest.php +++ b/tests/application/modules/opac/controllers/BibControllerTest.php @@ -396,6 +396,45 @@ abstract class BibControllerBibViewTestCase extends BibControllerWithZoneTestCas } } +class BibControllerBibViewOnlyAfternoonAnnecyTest extends BibControllerBibViewTestCase { + public function setUp() { + parent::setUp(); + ZendAfi_Auth::getInstance()->clearIdentity(); + Class_Ouverture_Visitor::setTimeSource(new TimeSourceForTest('2016-06-24 08:08:42')); + + + $this->fixture('Class_Ouverture', + ['id' => 21, + 'id_site' => 4, + 'label' => 'Horaires réduits', + 'jour_semaine' => Class_Ouverture::MARDI, + 'debut_matin' => '00:00', + 'fin_matin' => '00:00', + 'debut_apres_midi' => '15:00', + 'fin_apres_midi' => '17:00', + ]); + + + Class_bib::find(4) + ->setHoraire(' '); + + $this->dispatch('bib/bibview/id/4', true); + } + + + public function tearDown() { + Class_Ouverture_Visitor::setTimeSource(null); + parent::tearDown(); + } + + + /** @test */ + public function openingsShouldContainsDefaultOpening() { + $this->assertXPathContentContains('//div[contains(@class, "library_schedule")]//dd', + 'Mardi : 15h - 17h', $this->_response->getBody()); + } + +} class BibControllerBibViewAnnecyTest extends BibControllerBibViewTestCase {