Merge branch 'dev#71664_prettyphoto_ko' into 'master'

Dev#71664 prettyphoto ko

See merge request afi/opacce!2507

tests/application/modules/admin/controllers/CmsControllerTest.php

@@ -771,13 +771,13 @@ class CmsControllerArticleConcertEditActionTest extends CmsControllerWithPermiss
 
   /** @test */
   function previewShouldContainsArticleUrl() {
-    $this->assertXPath('//a[@data-prettyphoto="true"][contains(@href, "/cms/articleview/id/4")]');
+    $this->assertXPath('//a[contains(@href, "/cms/articleview/id/4")]');
   }
 
 
   /** @test */
   function previewTitleShouldBeVisualisationDeLArticle() {
-    $this->assertXPath('//a[@data-prettyphoto="true"][contains(@title, "Visualisation de l\'article: Erik Truffaz en concert")]');
+    $this->assertXPath('//a[contains(@title, "Erik Truffaz en concert")]');
   }
 
 
@@ -811,13 +811,7 @@ class CmsControllerArticleConcertEditRenderPopupActionTest extends CmsController
   /** @test */
   public function tagPreviewArticleShouldNotHaveRenderPopupInLink() {
     $this->_xpath->assertXPath($this->_json->content,
-                               '//a[contains(@href, "cms/articleview/id/4?iframe=true")]');
-  }
-
-
-  /** @test */
-  public function prettyPhotoShouldBeLoaded() {
-    $this->_xpath->assertXPath($this->_json->content, '//script[contains(@src, "jquery.prettyPhoto")]');
+                               '//a[contains(@href, "cms/articleview/id/4")]');
   }
 
 
@@ -2607,7 +2601,7 @@ class CmsControllerArticleExistingTraductionEditTest extends CmsControllerWithPe
 
   /** @test */
   function previewShouldContainsArticleUrl() {
-    $this->assertXPath('//a[@data-prettyphoto="true"][contains(@href, "cms/articleview/id/41")]');
+    $this->assertXPath('//a[contains(@href, "cms/articleview/id/41")]');
   }
 }
 

tests/application/modules/admin/controllers/ProfilControllerIndexTest.php

@@ -124,13 +124,7 @@ class Admin_ProfilControllerWithAdminPortailIndexTest extends Admin_ProfilContro
 
   /** @test */
   function previewPageAccueilAnchorTitleShouldBeVisualisationDeLaPageAdulte() {
-    $this->assertXPath('//div/ul[1]//li[1]//a[@data-prettyphoto="true"][contains(@title, "Visualisation de la page \'Adulte\'")][@href="/index/index/id_profil/8?iframe=true&width=95%25&height=95%25"]');
-  }
-
-
-  /** @test */
-  public function prettyPhotoShouldBeLoaded() {
-    $this->assertXPath('//script[contains(@src, "public/admin/js/prettyphoto/js/jquery.prettyPhoto.js")]');
+    $this->assertXPath("//div/ul[1]//li[1]//a[contains(@title, 'Ouvrir la page \"Adulte\"')][@href='/index/index/id_profil/8']");
   }
 
 

tests/application/modules/admin/controllers/SitothequeControllerTest.php

@@ -167,7 +167,6 @@ class SitothequeControllerSitoEditTest extends SitothequeControllerTestCase {
 
   /**
    * @group integration
-   * @disabledtest (anchor with attribute rel = prettyPhoto is not html5 valid)
    */
   public function pageShouldBeHtml5Valid() {
     $this->assertHTML5();

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

@@ -421,12 +421,6 @@ class BibNumeriqueControllerViewAlbumActionPremierVolumeTest extends AbstractBib
   }
 
 
-  /** @test */
-  public function viewerScriptShouldBePresent() {
-    $this->assertXPath('//script[contains(@src, "prettyPhoto.js")]');
-  }
-
-
   /** @test */
   public function pageBibNumShouldBeHTML5Compliant() {
     $this->assertHTML5();

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

@@ -358,7 +358,7 @@ class PanierControllerIndexWithPanierIdFifteenTest extends PanierControllerTestC
 
   /** @test */
   public function pageShouldContainsLinkToViewNoticeMontespan() {
-    $this->assertXPath('//a[contains(@href, "/recherche/viewnotice/id/4?iframe=true")]');
+    $this->assertXPath('//a[contains(@href, "/recherche/viewnotice/id/4")]');
   }
 }
 

tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php

@@ -420,23 +420,13 @@ class BibNumeriqueAlbumTeaserTest extends AbstractBibNumeriqueViewHelperWithAlbu
    * @depends withoutOrderInPrefShouldRespectInitialOrder
    * @test
    */
-  public function secondImageShouldLinkToFullImagePrettyPhoto($html) {
+  public function secondImageShouldLinkToFullImage($html) {
     $this->assertXPath($html,
-                       '//a[contains(@href, "/bib-numerique/get-resource/id/2")][@data-rel="prettyphoto[Harlock]"][@title="Le capitaine en slip"]',
+                       '//a[contains(@href, "/bib-numerique/get-resource/id/2")][contains(@title,"Le capitaine en slip")]',
                        $html);
   }
 
 
-  /** @test */
-  public function pageShouldContainsCodeToLoadPrettyPhoto() {
-    $this->_buildHelperLimitedTo(2);
-    $this->_helper->getBoite();
-    $this->assertXPath(Class_ScriptLoader::getInstance()->html(),
-                       '//script[contains(@src,"prettyPhoto")]');
-  }
-
-
-
   /** @test */
   public function withOrderRespectInPrefShouldRespectInitialOrder() {
     $this->_buildHelperLimitedToFourOrderedBy(Class_Systeme_ModulesAccueil_BibliothequeNumerique::ORDER_SELECTION);