Merge branch...

Merge branch 'hotline#138355_bokeh_intranet_lien_vers_les_notices_depuis_les_flux_rss_mauvaise_url_' into 'hotline'

hotline: #138355 : link to notice in rss was broken

See merge request !4209

VERSIONS_HOTLINE/138355

+ - ticket #138355 : Flux Rss : Correction des liens vers les notices dans les flux RSS générés par les carrousels.
\ No newline at end of file

application/modules/opac/controllers/RssController.php

@@ -314,7 +314,7 @@ class RssController extends ZendAfi_Controller_Action {
       $items [] = ['titre' => '<![CDATA[' . str_replace(BR, ' ', $record->getTitrePrincipal()) . ', ' . $record->getAuteurPrincipal() . ']]>' ,
                   'lien' => $this->view->absoluteUrl([
                                                       'controller' => 'recherche',
-                                                      'action' => 'viewrecord',
+                                                      'action' => 'viewnotice',
                                                       'id' => $record->getId(),
                                                       ], null, true),
                   'desc' => '<![CDATA[' . $this->_noticeRssDescription($record) . ']]>',

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

@@ -296,8 +296,10 @@ class RssControllerKiosqueTest extends AbstractControllerTestCase {
 
 
   /** @test */
-  public function rssLinkShouldContainBaseUrl() {
-    $this->assertXPathContentContains('//link', BASE_URL);
+  public function rssLinkShouldContainBaseUrl_recherche_viewnotice_id_1() {
+    /* hotline: #138355 */
+    $this->assertXPathContentContains('//link',
+                                      BASE_URL . '/recherche/viewnotice/id/1');
   }
 
 
@@ -447,4 +449,4 @@ class RssControllerCritiquesTest extends AbstractControllerTestCase {
   public function rssItemFirstImageShouldBeRawThumbnail() {
     $this->assertContains('recherche/raw-thumbnail/id/1"/><media:content', $this->_response->getBody());
   }
-}
\ No newline at end of file
+}

tests/scenarios/Templates/TemplatesRssTest.php

@@ -123,6 +123,14 @@ class TemplatesRssForVolatileKiosqueTest extends AbstractControllerTestCase {
   public function ninNinDansLUniversShouldBePresent() {
     $this->assertXPathContentContains('//item/title', '<![CDATA[NinNin dans l\'Univers, ]]>');
   }
+
+
+  /* hotline: #138355 */
+  /** @test */
+  public function linkToRecordShouldBeBokeh_recherche_viewnotice_id_1() {
+    $this->assertXPathContentContains('//item/link',
+                                      '/recherche/viewnotice/id/1');
+  }
 }