Merge branch 'hotline#33603_probleme_import_url_jamendo' into 'stable'

Hotline#33603 probleme import url jamendo

See merge request !1305

VERSIONS_HOTLINE/33603

+ - ticket #33603 : Jamendo : Prise en charge du nouveau format de l'url des albums
\ No newline at end of file

library/Class/WebService/BibNumerique/Jamendo.php

@@ -103,7 +103,7 @@ class Class_WebService_BibNumerique_Jamendo extends Class_WebService_BibNumeriqu
 
 
   public function importFromUrl($url) {
-    if (!preg_match('/www.jamendo.com.*\/a([0-9]+)\//', $url, $matches))
+    if (!preg_match('/www.jamendo.com.*\/album\/([0-9]+)\//', $url, $matches))
       return null;
 
     $album_id = $matches[1];

tests/library/Class/WebService/Jamendo/JamendoTest.php

@@ -67,7 +67,7 @@ class JamendoImportTracksFromUrlTest extends JamendoTestCase {
   public function setUp() {
     parent::setUp();
     $this->_jamendo = new Class_WebService_BibNumerique_Jamendo();
-    $this->_jamendo->importFromUrl('https://www.jamendo.com/fr/list/a146203/tracks');
+    $this->_jamendo->importFromUrl('https://www.jamendo.com/album/146203/tracks');
   }
 
 
@@ -92,7 +92,7 @@ class JamendoImportTracksFromUrlTest extends JamendoTestCase {
 
   /** @test */
   public function importingAlbumTwiceShouldNotRecreateIt() {
-    $this->_jamendo->importFromUrl('https://www.jamendo.com/fr/list/a146203/tracks');
+    $this->_jamendo->importFromUrl('https://www.jamendo.com/album/146203/tracks');
     $this->assertCount(1, Class_Album::findAll());
   }
 
@@ -382,7 +382,7 @@ class HarvestControllerJamendoImportActionTest extends HarvestControllerJamendoT
   /** @test */
   public function importTracksAlbumShouldCreateAlbum() {
     $this->postDispatch('/admin/harvest/jamendo-browse',
-                        ['url' => 'https://www.jamendo.com/fr/list/a146203/tracks']);
+                        ['url' => 'https://www.jamendo.com/album/146203/tracks']);
     $this->assertEquals('Tracks', Class_Album::find(1)->getTitre());
   }
 
@@ -390,7 +390,7 @@ class HarvestControllerJamendoImportActionTest extends HarvestControllerJamendoT
   /** @test */
   public function importAlbumsShouldRedirectToPageAlbum() {
     $this->postDispatch('/admin/harvest/jamendo-browse',
-                        ['url' => 'https://www.jamendo.com/fr/list/a146203/tracks']);
+                        ['url' => 'https://www.jamendo.com/album/146203/tracks']);
     $this->assertRedirectTo('/admin/album/edit_album/id/1');
 
   }
@@ -399,7 +399,7 @@ class HarvestControllerJamendoImportActionTest extends HarvestControllerJamendoT
   /** @test */
   public function importAlbumsShouldNotifySuccessfullImport() {
     $this->postDispatch('/admin/harvest/jamendo-browse',
-                        ['url' => 'https://www.jamendo.com/fr/list/a146203/tracks']);
+                        ['url' => 'https://www.jamendo.com/album/146203/tracks']);
     $this->assertFlashMessengerContentContains('Album "Tracks" importé de Jamendo');
   }