Merge branch 'hotline#24903_thumbnails_urls' into 'hotline-master'

Hotline#24903 thumbnails urls

See merge request !851

VERSIONS_HOTLINE/24903

+- ticket #24903 : les urls de génération des vignettes utilisent le format ZF, ce qui corrige un problème de chargement selon l'infrastructure d'installation
\ No newline at end of file

library/Class/WebService/Vignette.php

@@ -63,7 +63,12 @@ class Class_WebService_Vignette extends Class_WebService_Abstract {
 
 	public static function getAjaxUrl($notice) {
 		$clef_controle = Class_WebService_Vignette::getClefControle();
-		return BASE_URL."/recherche/vignette?clef=".$clef_controle."&id_notice=".$notice->getId();
+		return Class_Url::assemble(['controller' => 'recherche',
+																'action' => 'vignette',
+																'clef' => $clef_controle,
+																'id_notice' => $notice->getId()],
+															 null,
+															 true);
 	}
 
 //------------------------------------------------------------------------------------------------------

tests/application/modules/telephone/controllers/RechercheControllerTest.php

@@ -255,7 +255,7 @@ class Telephone_RechercheControllerFrbrWithLinksTest extends TelephoneAbstractCo
 
 	/** @test */
 	public function tintinPicarosShouldHaveImageFromVignetteAction() {
-		$this->assertXPath('//li/a/img[contains(@src, "/recherche/vignette?clef=")]');
+		$this->assertXPath('//li/a/img[contains(@src, "/recherche/vignette/clef")][contains(@src, "/id_notice/555")]');
 	}
 }
 

tests/library/Class/NoticeTest.php

@@ -118,7 +118,7 @@ class NoticeVignetteTest extends Storm_Test_ModelTestCase {
 
 	/** @test */
 	public function withoutThumbnailFetchUrlVignetteShouldAnswerVignetteActionForAjax() {
-		$this->assertContains('/recherche/vignette?clef=',
+		$this->assertContains('/recherche/vignette/clef/',
 												$this->_notice_without_thumbnails->fetchUrlVignette());
 		$this->assertFalse($this->_http_client->methodHasBeenCalled('open_url'));
 	}