From a35c8b3926617b692322d0b7aa48bac806732f68 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Tue, 3 Dec 2013 16:45:11 +0000
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20mise=20sous=20test=20visu?=
 =?UTF-8?q?=20article=20avant=20refacto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opac/controllers/CmsController.php        |  1 -
 .../views/scripts/cms/article_partial.phtml   |  8 +++---
 .../opac/controllers/CmsControllerTest.php    | 28 ++++++++++++++++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/application/modules/opac/controllers/CmsController.php b/application/modules/opac/controllers/CmsController.php
index 08bebaee801..6ce321f63a5 100644
--- a/application/modules/opac/controllers/CmsController.php
+++ b/application/modules/opac/controllers/CmsController.php
@@ -40,7 +40,6 @@ class CmsController extends Zend_Controller_Action {
 	 *		'cat': identifiant de la catégorie
 	 */
 	public function articleviewbydateAction() {
-	
 		$id_profil = (int)$this->_getParam('id_profil');
 		$id_module = (int)$this->_getParam('id_module');
 		if (!$profil = Class_Profil::getLoader()->find($id_profil))
diff --git a/application/modules/opac/views/scripts/cms/article_partial.phtml b/application/modules/opac/views/scripts/cms/article_partial.phtml
index 03b2b877ec9..e709562c182 100644
--- a/application/modules/opac/views/scripts/cms/article_partial.phtml
+++ b/application/modules/opac/views/scripts/cms/article_partial.phtml
@@ -18,8 +18,8 @@ echo $this->tagEditArticle($this->article);
 ?>
 
 <div class="auto_resize article">
+	<!-- RSPEAK_START -->		
 	<?php
-		
 	echo $this->readSpeaker(
 													'cms',
 													'articleread',
@@ -48,11 +48,11 @@ echo $this->tagEditArticle($this->article);
 </div>
 <script type="text/javascript">
 			$('#reseaux-sociaux-<?php echo $this->article->getId();?>').load('<?php
-				echo $this->url(array(
+				echo $this->url([
 					'controller'	=> 'cms',
 					'action'			=> 'reseau',
 					'id_article'	=> $this->article->getId()
-				));
+				], null, true);
 			?>');
 		</script>
 	<?php } ?>
@@ -63,4 +63,4 @@ echo $this->tagEditArticle($this->article);
 	} ?>
 </div>
 
-<?php echo $this->closeBoite(); ?>
\ No newline at end of file
+<?php echo $this->closeBoite(); ?>
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index 66e871abe18..1da8ce5d2ca 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -657,7 +657,15 @@ class CmsControllerArticleViewTest extends CmsControllerWithFeteDeLaFriteTestCas
 
 	/** @test */
 	public function socialNetworksContainerShouldBePresent() {
-		$this->assertXpath('//div[@id="reseaux-sociaux-224"]');
+		$this->assertXpath('//div[@id="reseaux-sociaux-224"]/img[contains(@src, "patience.gif")]');
+	}
+
+
+	/** @test */
+	public function socialNetworksScriptShouldBePresent() {
+		$this->assertXPathContentContains('//script', 
+																			"$('#reseaux-sociaux-224').load('/cms/reseau/id_article/224')",
+																			$this->_response->getBody());
 	}
 
 
@@ -751,7 +759,6 @@ class CmsControllerArticleViewAsAdminTest extends CmsControllerWithFeteDeLaFrite
 	}
 
 
-
 	/** @test */
 	public function avisHmmShouldHaveLinkForDeletion() {
 		$this->assertXPath('//table[@class="avis"]//td[contains(text(), "Hmmm")]//a[contains(@href, "admin/modo/delete-cms-avis/id/34")]');
@@ -762,6 +769,12 @@ class CmsControllerArticleViewAsAdminTest extends CmsControllerWithFeteDeLaFrite
 	public function avisArgShouldHaveLinkForDeletion() {
 		$this->assertXPath('//table[@class="avis"]//td[contains(text(), "Argg")]//a[contains(@href, "admin/modo/delete-cms-avis/id/35")]');
 	}
+
+
+	/** @test */
+	public function tagEditArticleShouldBeVisible() {
+		$this->assertXPath('//a[contains(@href, "/admin/cms/newsedit/id/224")]');
+	}
 }
 
 
@@ -808,12 +821,12 @@ class CmsControllerArticleReadTest extends CmsControllerWithFeteDeLaFriteTestCas
 
 	/** @test */
 	public function speakStartMarkerShouldBePresent() {
-		$this->assertXpathContentContains('//body', '<!-- RSPEAK_START -->');
+		$this->assertXpathContentContains('//div[@class="auto_resize article"]', '<!-- RSPEAK_START -->');
 	}
 
 	/** @test */
 	public function speakStopMarkerShouldBePresent() {
-		$this->assertXpathContentContains('//body', '<!-- RSPEAK_STOP -->');
+		$this->assertXpathContentContains('//div[@class="auto_resize article"]', '<!-- RSPEAK_STOP -->');
 	}
 
 
@@ -983,6 +996,13 @@ class CmsControllerArticleViewPreferencesSummaryTest extends CmsControllerListTe
 	public function aDivShouldContainsCeSoirCaFrite() {
 		$this->assertXPathContentContains('//div', 'Ce soir ça frite !');
 	}
+
+
+	/** @test */
+	public function linkLireArticleCompleShouldBePresent() {
+		$this->assertXPathContentContains('//a[contains(@href, "/cms/articleview/id/224")]',
+																			"Lire l'article complet");
+	}
 }
 
 
-- 
GitLab