From 9a636e58708aa159b7d80a71a796e87c5db67b23 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@git-test.afi-sa.fr>
Date: Fri, 16 Nov 2012 17:28:37 +0000
Subject: [PATCH] Formulaire : ajoute un message de confirmation lors de
 l'enregistrement du formulaire,

---
 .../opac/controllers/FormulaireController.php      |  1 +
 .../opac/views/scripts/formulaire/add.phtml        | 14 ++++++++++++++
 .../controllers/ModoControllerFormulaireTest.php   |  3 +--
 .../opac/controllers/FormulaireControllerTest.php  | 14 +++++++++++++-
 tests/library/Class/ArticleFormulaireTest.php      |  1 +
 tests/library/ZendAfi/View/Helper/CkEditorTest.php |  7 +++++--
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/application/modules/opac/controllers/FormulaireController.php b/application/modules/opac/controllers/FormulaireController.php
index 51a5dbfd53b..a47089110c7 100644
--- a/application/modules/opac/controllers/FormulaireController.php
+++ b/application/modules/opac/controllers/FormulaireController.php
@@ -25,6 +25,7 @@ class FormulaireController extends ZendAfi_Controller_Action {
 							 ->setUser(Class_Users::getIdentity())
 							 ->setIdArticle($this->_request->getParam('id_article'))
 							 ->save();
+		$this->view->datas = unserialize($formulaire->getData());
 	}
 
 }
diff --git a/application/modules/opac/views/scripts/formulaire/add.phtml b/application/modules/opac/views/scripts/formulaire/add.phtml
index e69de29bb2d..37fb1395f04 100644
--- a/application/modules/opac/views/scripts/formulaire/add.phtml
+++ b/application/modules/opac/views/scripts/formulaire/add.phtml
@@ -0,0 +1,14 @@
+<?php
+echo ('Merci. Le formulaire a bien ÊtÊ enregistrÊ :');
+
+echo '<br/><ul>';
+
+foreach ($this->datas as $key => $value) {
+	echo "<li>";
+	if (isset($key)) echo $key;
+	echo " : ";
+	if (isset($value)) echo $value;
+	echo " <br/> ";
+}
+?>
+</ul>
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
index d9e24b1d3b7..a343becefae 100644
--- a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
@@ -39,8 +39,7 @@ class ModoControllerFormulaireForArticleListTest extends Admin_AbstractControlle
 			Class_Formulaire::newInstanceWithId(6, ['data' => serialize(['name' => 'Lefort',
 																																	 'prenom' => 'Nono',
 																																	 'age' => 12])]) 
-		])
-		->beStrict();
+		]);
 
 
     $this->dispatch('admin/modo/formulaires/id_article/12', true);
diff --git a/tests/application/modules/opac/controllers/FormulaireControllerTest.php b/tests/application/modules/opac/controllers/FormulaireControllerTest.php
index 0dfc14f7dc4..90ee3e77ecd 100644
--- a/tests/application/modules/opac/controllers/FormulaireControllerTest.php
+++ b/tests/application/modules/opac/controllers/FormulaireControllerTest.php
@@ -61,7 +61,7 @@ class FormulaireControllerPostActionTest extends FormulaireControllerPostActionT
 												,true);
 
 		$this->new_formulaire = Class_Formulaire::find(2);
-	}
+ 	}
 
 	
 	/** @test */
@@ -94,6 +94,18 @@ class FormulaireControllerPostActionTest extends FormulaireControllerPostActionT
 	public function articleShouldBeContactezNous() {
 		$this->assertEquals('Contactez nous', $this->new_formulaire->getArticle()->getTitre());
 	}
+
+	/** @test */
+	public function postFormulaireShouldReturnMessage() {
+		$this->assertXpathContentContains('//div','Merci.',true );
+	}
+
+
+	/** @test */
+	public function postFormulaireShouldReturnPostValues() {
+		$this->assertXpathContentContains('//div','Tinguette',true );
+	}
+
 }
 
 
diff --git a/tests/library/Class/ArticleFormulaireTest.php b/tests/library/Class/ArticleFormulaireTest.php
index 860e830d6de..bb6274793b1 100644
--- a/tests/library/Class/ArticleFormulaireTest.php
+++ b/tests/library/Class/ArticleFormulaireTest.php
@@ -116,3 +116,4 @@ class ArticleFormulaireExternalTest extends Storm_Test_ModelTestCase {
 	}
 
 }
+
diff --git a/tests/library/ZendAfi/View/Helper/CkEditorTest.php b/tests/library/ZendAfi/View/Helper/CkEditorTest.php
index 675cc84224f..c33b4835016 100644
--- a/tests/library/ZendAfi/View/Helper/CkEditorTest.php
+++ b/tests/library/ZendAfi/View/Helper/CkEditorTest.php
@@ -28,7 +28,8 @@ class CkEditorWithFormulaireEnabledTest extends ViewHelperTestCase {
 			parent::setUp();
 			$this->_helper = new ZendAfi_View_Helper_CkEditor();
 			$this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
-			define('URL_CSS','');
+			if (!defined('URL_CSS')) 
+				define('URL_CSS','');
 			Class_AdminVar::newInstanceWithId('CMS_FORMULAIRES')->setValeur(1);
 			$this->_html=$this->_helper->ckeditor('','','');
 		}
@@ -49,7 +50,9 @@ class CkEditorWithFormulaireDisabledTest extends ViewHelperTestCase {
 			parent::setUp();
 			$this->_helper = new ZendAfi_View_Helper_CkEditor();
 			$this->_helper->setView(new ZendAfi_Controller_Action_Helper_View());
-			define('URL_CSS','');
+			if (!defined('URL_CSS')) 
+				define('URL_CSS','');
+
 			Class_AdminVar::newInstanceWithId('CMS_FORMULAIRES')->setValeur(0);
 			$this->_html=$this->_helper->ckeditor('','','');
 		}
-- 
GitLab