From 075f277a2029131affe66c9032d46db95bce765a Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Wed, 19 Mar 2014 16:00:13 +0100
Subject: [PATCH] Make test not depends on real CosmoVars
---
library/Class/Notice.php | 32 +++++++++-------
.../controllers/NoticeAjaxControllerTest.php | 37 +++++++++++--------
2 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index ec70b173e67..5624737e8e3 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -1591,30 +1591,34 @@ class Class_Notice extends Storm_Model_Abstract {
if (isset($result[0])) {
// black list
$trav = Class_CosmoVar::get('black_list_856');
- if (trim($trav)) $black_list = explode(";", $trav);
+ $black_list = (trim($trav)) ? explode(';', $trav) : [];
// controle url pour target
$target = Class_CosmoVar::get('url_site');
$trav = explode('/', $target);
$ctrl_target = array_pop($trav);
- if (!trim($ctrl_target)) $ctrl_target = array_pop($trav);
+ if (!trim($ctrl_target))
+ $ctrl_target = array_pop($trav);
// tableau des liens
- foreach ($result as $item)
- {
+ foreach ($result as $item) {
$controle = true;
- if ($black_list)
- {
- foreach ($black_list as $mot)
- {
- if (stripos($item, $mot) !== false)
- { $controle = false; break; }
+ if ($black_list) {
+ foreach ($black_list as $mot) {
+ if (stripos($item, $mot) !== false) {
+ $controle = false;
+ break;
+ }
}
}
- if ($controle == true)
- {
- if (substr(strtoupper($item), 0, 4) != "HTTP") $item = "http://" . $item;
- if (strpos($item, $ctrl_target) === false) $target = 'target="_blank"'; else $target="";
+
+ if ($controle == true) {
+ if (substr(strtoupper($item), 0, 4) != 'HTTP')
+ $item = 'http://' . $item;
+
+ $target = (strpos($item, $ctrl_target) === false)
+ ? 'target="_blank"' : '';
+
$lien[] = '<a href="' . trim($item) . '" ' . $target . ">" . trim($item) . '</a>';
}
}
diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
index 2dd2533aaf0..d851e82af21 100644
--- a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
+++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
@@ -58,7 +58,7 @@ class NoticeAjaxControllerNonRegressionTest extends AbstractControllerTestCase {
- class NoticeAjaxControllerNoticeWithGamUrlTestCase extends AbstractControllerTestCase {
+class NoticeAjaxControllerNoticeWithGamUrlTestCase extends AbstractControllerTestCase {
protected $_wesley;
public function setUp() {
@@ -67,18 +67,20 @@ class NoticeAjaxControllerNonRegressionTest extends AbstractControllerTestCase {
Class_Profil::getCurrentProfil()
->setCfgModules(['recherche' => ['resultatsimple' => ['liste_codes' => "TANECRG"]]]);
+ $this->_wesley = $this->fixture(
+ 'Class_Notice',
+ ['id' => 1,
+ 'facettes' => 'A1',
+ 'isbn' => '',
+ 'ean' => '',
+ 'type_doc' => 1,
+ 'tome_alpha' => '',
+ 'clef_alpha' => 'Wesley',
+ 'unimarc' => "02502njm0 22007331 450 001000600000071003700006100004100043101000800084127001000092200004500102200000300147210003900150215000900189327000300198345004200201464000300243464000300246464000300249464000300252464000300255464000300258464000300261464000300264464000300267464000300270464000300273464000300276464000300279464001900282464002100301464001600322464001000338464002400348464002500372464001100397464002500408464002900433464002800462464001800490464001500508464001700523686002900540700003200569700000300601701003200604702004000636702003400676702003300710702003800743702004400781702003500825702003600860702003100896711000300927801002200930856013200952933014701084984013201231985008201363985008401445985007901529985007301608985008701681347931 00 a2784087 bHIP-OSelect.com/Polydor a20130311d2011 u y0frey0103 ba 0 aeng a53:22 1 aThe Lost album featuring Watermelon man 1 cUniversal Records dRÂeedition 2011 a1 cd 1 b0602527840871 cdisque compact d7,48 E 1 1 1 1 1 1 1 1 1 1 1 1 1 tWatermelon man tSweet loneliness tSecret love tSeulb tYou've got a friend tTransmograpification tUse me tGet on the good foot tEverybody plays the fool tAlone again (Naturally) tBack stabbers tJ.B. shout tFunky & some a1.382 tJazz funky 2PCDM4 1 aWesley bFred 4000 6trombone 1 1 aThe JB's 4000 6ens. instr. 1 aFarrell bJoe 4000 6saxophone tÂenor 1 aStamm bMarvin 4btr 6trompette 1 aBrown bCharlie 4000 6guitare 1 aCranshaw bBob 4MBS 6basse guitare 1 aBrecker bMichael 4000 6saxophone tÂenor 1 aBrecker bRandy 4btr 6trompette 1 aCarter bRon 4MBS 6basse guitare 1 aGadd bSteve 4PDS 6batterie 02 0 aFR bGAM c20130311 4 uhttp://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg zFred Wesley / Lost album featuring Watermelon man (The) 3http://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg ahttp://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg ahttp://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg bFred Wesley / Lost album featuring Watermelon man (The) ahttp://www.gamannecy.com/polysson/201205/01-0602527840871.mp3 bWatermelon man ahttp://www.gamannecy.com/polysson/201205/02-0602527840871.mp3 bSweet loneliness ahttp://www.gamannecy.com/polysson/201205/03-0602527840871.mp3 bSecret love ahttp://www.gamannecy.com/polysson/201205/04-0602527840871.mp3 bSeulb ahttp://www.gamannecy.com/polysson/201205/05-0602527840871.mp3 bYou've got a friend ",
+ 'annee' => '2000',
+ 'url_vignette' => 'wesley_small.png',
+ 'url_image' => 'wesley.png']);
- $this->_wesley = Class_Notice::newInstanceWithId(1,
- ['facettes' => 'A1',
- 'isbn' => '',
- 'ean' => '',
- 'type_doc' => 1,
- 'tome_alpha' => '',
- 'clef_alpha' => 'Wesley',
- 'unimarc' => "02502njm0 22007331 450 001000600000071003700006100004100043101000800084127001000092200004500102200000300147210003900150215000900189327000300198345004200201464000300243464000300246464000300249464000300252464000300255464000300258464000300261464000300264464000300267464000300270464000300273464000300276464000300279464001900282464002100301464001600322464001000338464002400348464002500372464001100397464002500408464002900433464002800462464001800490464001500508464001700523686002900540700003200569700000300601701003200604702004000636702003400676702003300710702003800743702004400781702003500825702003600860702003100896711000300927801002200930856013200952933014701084984013201231985008201363985008401445985007901529985007301608985008701681347931 00 a2784087 bHIP-OSelect.com/Polydor a20130311d2011 u y0frey0103 ba 0 aeng a53:22 1 aThe Lost album featuring Watermelon man 1 cUniversal Records dRÂeedition 2011 a1 cd 1 b0602527840871 cdisque compact d7,48 E 1 1 1 1 1 1 1 1 1 1 1 1 1 tWatermelon man tSweet loneliness tSecret love tSeulb tYou've got a friend tTransmograpification tUse me tGet on the good foot tEverybody plays the fool tAlone again (Naturally) tBack stabbers tJ.B. shout tFunky & some a1.382 tJazz funky 2PCDM4 1 aWesley bFred 4000 6trombone 1 1 aThe JB's 4000 6ens. instr. 1 aFarrell bJoe 4000 6saxophone tÂenor 1 aStamm bMarvin 4btr 6trompette 1 aBrown bCharlie 4000 6guitare 1 aCranshaw bBob 4MBS 6basse guitare 1 aBrecker bMichael 4000 6saxophone tÂenor 1 aBrecker bRandy 4btr 6trompette 1 aCarter bRon 4MBS 6basse guitare 1 aGadd bSteve 4PDS 6batterie 02 0 aFR bGAM c20130311 4 uhttp://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg zFred Wesley / Lost album featuring Watermelon man (The) 3http://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg ahttp://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg ahttp://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg bFred Wesley / Lost album featuring Watermelon man (The) ahttp://www.gamannecy.com/polysson/201205/01-0602527840871.mp3 bWatermelon man ahttp://www.gamannecy.com/polysson/201205/02-0602527840871.mp3 bSweet loneliness ahttp://www.gamannecy.com/polysson/201205/03-0602527840871.mp3 bSecret love ahttp://www.gamannecy.com/polysson/201205/04-0602527840871.mp3 bSeulb ahttp://www.gamannecy.com/polysson/201205/05-0602527840871.mp3 bYou've got a friend ",
- 'annee' => '2000',
- 'url_vignette' => 'wesley_small.png',
- 'url_image' => 'wesley.png']);
$mock_sql = Storm_Test_ObjectWrapper::on(Zend_Registry::get('sql'));
Zend_Registry::set('sql', $mock_sql);
@@ -86,16 +88,21 @@ class NoticeAjaxControllerNonRegressionTest extends AbstractControllerTestCase {
->whenCalled('fetchOne')
->with("select valeur from variables where clef='black_list_856'")
->answers('electre');
+
+ $this->fixture('Class_CosmoVar', ['id' => 'types_docs',
+ 'liste' => "1:cd\r\n200:non identifié\r\n201:livres\r\n202:bd"]);
}
+
/** @test */
public function withNoticeFoundResponseShouldContainsLienInternet() {
$this->dispatch('/opac/noticeajax/detail/id_notice/1', true);
$this->assertXPathContentContains('//a', 'http://www.gamannecy.com//upload/albums/201202/0602527840871_thumb.jpg', $this->_response->getBody());
- }
-
-
+ }
}
+
+
+
abstract class NoticeAjaxControllerNoticeSouleymaneTestCase extends AbstractControllerTestCase {
protected $_souleymane;
--
GitLab