dev #40126 test fix & refactoring

library/ZendAfi/View/Helper/Accueil/Library.php

@@ -89,11 +89,12 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
     if (!$this->_selected_filters)
       return $libraries;
 
-    $filter = function ($library) {
-      foreach($this->_selected_filters as $id => $values) {
-        if (false === strpos($id, 'custom_field'))
-          return true;
+    $custom_field_filters = array_filter($this->_selected_filters,
+                                         'is_int',
+                                         ARRAY_FILTER_USE_KEY);
 
+    $filter = function ($library) use ($custom_field_filters) {
+      foreach($custom_field_filters as $id => $values) {
         if ($values != $library->findCustomFieldValueMatching($id, $values))
           return false;
       }

library/ZendAfi/View/Helper/FilterElements.php

@@ -146,6 +146,11 @@ class ZendAfi_View_Helper_FilterElementsNull extends ZendAfi_View_Helper_FilterE
 
 
 class ZendAfi_View_Helper_FilterElementsOpening extends ZendAfi_View_Helper_FilterElements {
+  public function __construct($custom_field_id = null) {
+    $this->_custom_field_id = 'opening';
+  }
+
+
   public function elements() {
     return ['opened' => $this->view->_('Ouvert')];
   }

tests/application/modules/opac/controllers/BibControllerTest.php

@@ -955,13 +955,17 @@ class BibControllerWidgetPageSelectOpenLibrariesTest extends BibControllerWidget
   public function urlForOpeningAllBibsShouldNotContainsOpeningOpened() {
     $this->assertXPath('//li[@class="opening"]//a[contains(text(), "Tous")][not(contains(@href, "opening/opened"))]');
   }
+
+  /** @test */
+  public function openedLinkShouldHaveClassSelected() {
+    $this->assertXPath('//li[@data-id="opening"]//li[@class="selected"]//a[contains(@href, "opening/opened")]', $this->_response->getBody());
+  }
 }
 
 
 
 
 class BibControllerSelectionOrderDisplayAndFiltersTest extends BibControllerWidgetPageTestCase {
-
   public function setUp() {
     parent::setUp();
 
@@ -1041,3 +1045,21 @@ class BibControllerSelectionOrderDisplayAndFiltersTest extends BibControllerWidg
     $this->assertXPath('//ul[contains(@class, "filters")][contains(@class, "list")][contains(@class, "right")]');
   }
 }
+
+
+
+
+
+class BibControllerSelectionOrderFiltersByCustomFieldAndOpeningTest extends BibControllerWidgetPageTestCase {
+  public function setUp() {
+    parent::setUp();
+    Class_Bib::setTimeSource(new TimeSourceForTest('2016-03-15 11:00:00'));
+    $this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1/opening/opened/custom_field_7/Wifi%3BRestauration/custom_field_3/Jeunes/', true);
+  }
+
+
+  /** @test */
+  public function libCranShouldNotBePresent() {
+    $this->assertNotXPathContentContains('//div[@class="contenu"]//section//h2', 'Cran');
+  }
+}