From df9496650eba4a1d1e0cafce699a21f9bb6668e6 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Wed, 5 Nov 2014 17:08:01 +0100
Subject: [PATCH] hotline_#16652_search_with_bib_filter fix tests failures
---
.../View/Helper/TagRechercheSimpleTest.php | 40 ++++++++++---------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/tests/library/ZendAfi/View/Helper/TagRechercheSimpleTest.php b/tests/library/ZendAfi/View/Helper/TagRechercheSimpleTest.php
index 65140ed9c06..d52c9b86d76 100644
--- a/tests/library/ZendAfi/View/Helper/TagRechercheSimpleTest.php
+++ b/tests/library/ZendAfi/View/Helper/TagRechercheSimpleTest.php
@@ -77,10 +77,12 @@ class ZendAfi_View_Helper_TagRechercheSimpleDefaultTest extends ViewHelperTestCa
class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHelperTestCase {
+ protected $_session;
+
public function setUp() {
parent::setUp();
-
+ $this->_session = Zend_Registry::get('session');
$view = new ZendAfi_Controller_Action_Helper_View();
$this->_helper = new ZendAfi_View_Helper_TagRechercheSimple();
$this->_helper->setView($view);
@@ -102,11 +104,11 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
'libelle' => 'US']);
$chicago = $this->fixture('Class_Bib',
- ['id' => 4,
- 'id_site' => 1,
- 'libelle' => 'Chicago',
- 'id_zone' => 3,
- 'visibilite' => 2]);
+ ['id' => 4,
+ 'id_site' => 1,
+ 'libelle' => 'Chicago',
+ 'id_zone' => 3,
+ 'visibilite' => 2]);
$cairo = $this->fixture('Class_Bib',
['id' => 1,
@@ -123,11 +125,11 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
'id_zone' => 1]);
$paris = $this->fixture('Class_Bib',
- ['id' => 3,
- 'id_site' => '2',
- 'libelle' => 'Paris',
- 'visibilite' => 2,
- 'id_zone' => 2]);
+ ['id' => 3,
+ 'id_site' => '2',
+ 'libelle' => 'Paris',
+ 'visibilite' => 2,
+ 'id_zone' => 2]);
$berlin = $this->fixture('Class_Bib',
['id' => 78,
@@ -142,7 +144,7 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
/** @test */
public function withSelectionBibShouldPostExpectedValue() {
- $_SESSION['selection_bib'] = ['id_bibs' => [1,2,3]];
+ $this->_session->id_bibs = [1,2,3];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPath($html, '//form//input[@name="bib_select"][@type="hidden"][@value="1,2,3"]');
}
@@ -150,7 +152,7 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
/** @test */
public function withNoBibSelectedMessageShouldBeAsExpected() {
- $_SESSION['selection_bib'] = [];
+ $this->_session->id_bibs = [];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPathContentContains($html, '//div//p', utf8_encode('La recherche s\'effectue dans tout le réseau.'));
}
@@ -158,7 +160,7 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
/** @test */
public function withSelectedBib3MessageShouldBeAsExpected() {
- $_SESSION['selection_bib'] = ['id_bibs' => [3]];
+ $this->_session->id_bibs = [3];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPathContentContains($html, '//div//p/span/b', 'Paris');
}
@@ -166,7 +168,7 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
/** @test */
public function withSelectedBib1And3MessageShouldBeAsExpected() {
- $_SESSION['selection_bib'] = ['id_bibs' => [1,3]];
+ $this->_session->id_bibs = [1,3];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPathContentContains($html, '//div//p/span/b', 'Cairo, Paris');
}
@@ -174,7 +176,7 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
/** @test */
public function withSelectionBibAllMessageShouldBeAsExpected() {
- $_SESSION['selection_bib'] = ['id_bibs' => [1, 2, 3, 4, 78]];
+ $this->_session->id_bibs = [1, 2, 3, 4, 78];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPathContentContains($html, '//div//p', utf8_encode('La recherche s\'effectue dans tout le réseau.'));
}
@@ -182,15 +184,15 @@ class ZendAfi_View_Helper_TagRechercheSimpleWithSessionParamsTest extends ViewHe
/** @test */
public function withSelectionBib1And2MessageShouldBeAsExpected() {
- $_SESSION['selection_bib'] = ['id_bibs' => [1,2]];
+ $this->_session->id_bibs = [1,2];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPathContentContains($html, '//div//p/span/b', 'Africa');
}
- /** @test */
+ /** @test */
public function withSelectionBibByZone1and2MessageShouldBeAsExpected() {
- $_SESSION['selection_bib'] = ['id_bibs' => [1,2,3,78]];
+ $this->_session->id_bibs = [1,2,3,78];
$html = $this->_helper->tagRechercheSimple($this->_preferences, 1);
$this->assertXPathContentContains($html, '//div//p/span/b', 'Africa, Europe');
}
--
GitLab