From ec8f74957cc022b212d3b71f5bad4a0e1f7066b5 Mon Sep 17 00:00:00 2001
From: gloas <gloas@git-test.afi-sa.fr>
Date: Thu, 26 Sep 2013 13:20:35 +0000
Subject: [PATCH] correction tests ModoControllerFormulaire

---
 .gitattributes                                |  1 -
 .../admin/controllers/ModoController.php      |  1 +
 public/opac/js/loading_class.js               |  0
 .../ModoControllerFormulaireTest.php          | 22 +++++++++++++------
 .../controllers/RechercheControllerTest.php   |  2 --
 5 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 public/opac/js/loading_class.js

diff --git a/.gitattributes b/.gitattributes
index b449bb68bf8..42ca8870f84 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4483,7 +4483,6 @@ public/opac/js/imageMenu.js -text
 public/opac/js/jquery.placeholder.min.js -text
 public/opac/js/lien_reserver.js -text
 public/opac/js/liste_notices_mur.js -text
-public/opac/js/loading_class.js -text
 public/opac/js/menu.js -text
 public/opac/js/mootools.js -text
 public/opac/js/plan_acces.js -text
diff --git a/application/modules/admin/controllers/ModoController.php b/application/modules/admin/controllers/ModoController.php
index f1b1e8f2afd..f31ae8d817f 100644
--- a/application/modules/admin/controllers/ModoController.php
+++ b/application/modules/admin/controllers/ModoController.php
@@ -595,6 +595,7 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
 
 	
 	public function formulairesAction() {
+		xdebug_break();
 		$article = Class_Article::find($this->_getParam('id_article'));
 		if ($article) 
 			$this->view->subview = $this->view->partial(
diff --git a/public/opac/js/loading_class.js b/public/opac/js/loading_class.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
index d175308d18c..9914420ca3b 100644
--- a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
@@ -59,9 +59,17 @@ abstract class ModoControllerFormulaireForArticleTestCase extends Admin_Abstract
 			->whenCalled('delete')
 			->answers(true)
 
+			->whenCalled('delete')
+			->with($formulaire_de_bougie)
+			->answers(true)
+
 			->whenCalled('save')
 			->answers(true)
 
+			->whenCalled('save')
+			->with($formulaire_de_bougie)
+			->answers(true)
+
 			->whenCalled('findAllBy')
 			->with([ 'role' => 'article',
 							 'model' => $article,
@@ -73,7 +81,6 @@ abstract class ModoControllerFormulaireForArticleTestCase extends Admin_Abstract
 			->whenCalled('findAllBy')
 			->with([ 'role' => 'article',
 							 'model' => $article,
-							 'order' => 'date_creation desc',
 							 'validated' => false])
 			->answers([$formulaire_de_lefort])
 
@@ -82,7 +89,9 @@ abstract class ModoControllerFormulaireForArticleTestCase extends Admin_Abstract
 
 			->whenCalled('find')
 			->with('5')
-			->answers($formulaire_de_bougie);
+			->answers($formulaire_de_bougie)
+
+			->beStrict();
 	}
 }
 
@@ -402,11 +411,10 @@ class ModoControllerFormulaireForArticleListTest extends ModoControllerFormulair
   public function setUp() {
     parent::setUp();
 
-    $this->dispatch('admin/modo/formulaires/id_article/12');
+    $this->dispatch('admin/modo/formulaires/id_article/12',true);
   }
 
 
-
 	/** @test **/
 	public function subviewShouldContainsVoirTousLesReponses() {
 		$this->assertXPathContentContains('//a[contains(@href, "admin/modo/formulaires/id_article/12/liste/all")]','Afficher toutes les réponses');
@@ -415,7 +423,7 @@ class ModoControllerFormulaireForArticleListTest extends ModoControllerFormulair
 
 	/** @test */
 	public function lefortShouldBeDisplay() {
-		$this->assertXPathContentContains('//td', 'Lefort',$this->_response->getBody());
+		$this->assertXPathContentContains('//td', 'Lefort');
 	}
 
 
@@ -433,13 +441,13 @@ class ModoControllerFormulaireForArticleListTest extends ModoControllerFormulair
 	
 		/** @test */
 	public function aTDShouldContainsActionToValidateFormulaireLefort() {
-		$this->assertXPath('//tbody//tr[1]//td/a[contains(@href, "admin/modo/validate-formulaire/id_article/12/id/6")]');
+		$this->assertXPath('//tbody//tr//td/a[contains(@href, "admin/modo/validate-formulaire/id_article/12/id/6")]');
 	}
 
 
 	/** @test */
 	public function aTDShouldContainsActionToVisualiserFormulaireLefort() {
-		$this->assertXPath('//tbody//tr[1]//td/a[contains(@href, "admin/modo/visualiser-reponse-ajax/id_article/12/id/6")]',$this->_response->getBody());
+		$this->assertXPath('//tbody//tr//td/a[contains(@href, "admin/modo/visualiser-reponse-ajax/id_article/12/id/6")]',$this->_response->getBody());
 	}
 }
 
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index 55c57b1c14c..1565e950dbe 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -681,8 +681,6 @@ abstract class RechercheControllerSimpleActionhListeFormatTestCase extends Reche
 }
 
 
-
-
 class RechercheControllerSimpleActionWithListeFormatMurTest extends RechercheControllerSimpleActionhListeFormatTestCase {
 	protected $_liste_format = Class_Systeme_ModulesAppli::LISTE_FORMAT_MUR;
 
-- 
GitLab