From 0cba46c3145612e6e07e4aade3cda5c31e0720eb Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Thu, 6 Feb 2014 19:19:22 +0100
Subject: [PATCH] SAV: various test fixes
---
.../ModoControllerFormulaireTest.php | 126 ++++++++----------
.../controllers/FormulaireControllerTest.php | 2 +-
2 files changed, 60 insertions(+), 68 deletions(-)
diff --git a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
index d7663ba79f3..a49faacfa08 100644
--- a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
@@ -18,66 +18,61 @@
* along with AFI-OPAC 2.0; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+require_once 'AdminAbstractControllerTestCase.php';
abstract class ModoControllerFormulaireForArticleTestCase extends Admin_AbstractControllerTestCase {
protected $formulaire_de_bougie;
+
public function setUp() {
parent::setUp();
- $zork =
- Class_Users::newInstanceWithId(34,
- ['login' => 'zork',
- 'nom' => 'Bougie',
- 'prenom' => 'Mireille',
- 'mail' => 'mireille@afi-sa.fr',
- 'bib' => Class_Bib::newInstanceWithId(4, ['libelle' => 'Annecy'])]);
-
- $article = Class_Article::newInstanceWithId(12, ['titre' => 'Inscrivez vous au Hackaton']);
-
- $formulaire_de_tinguette =
- Class_Formulaire::newInstanceWithId(3,
- ['data' => serialize(['nom' => 'Tinguette',
- 'prenom' => 'Quentine']),
- 'date_creation' => '2012-12-05 12:00:23',
- 'article' => $article,
- 'validated' => false]);
-
- $this->formulaire_de_bougie =
- Class_Formulaire::newInstanceWithId(5, ['data' => serialize(['nom' => 'Bougie',
- 'Prenom' => 'Mireille']),
- 'date_creation' => '2012-12-06 10:00:01',
- 'article' => $article,
- 'validated' => false,
- 'user' => $zork]);
-
- $formulaire_de_lefort =
- Class_Formulaire::newInstanceWithId(6, ['data' => serialize(['name' => 'Lefort',
- 'prenom' => 'Nono',
- 'age' => 12,
- 'Securite-Sociale' => '789',
- 'Budget_(TOTEM)_régional' => 'budget régional' ]),
- 'date_creation' => '2012-11-06 17:00:01',
- 'article' => $article]);
+ $zork = $this->fixture('Class_Users',
+ ['id' => 34,
+ 'login' => 'zork',
+ 'nom' => 'Bougie',
+ 'prenom' => 'Mireille',
+ 'password' => 'mimi',
+ 'mail' => 'mireille@afi-sa.fr',
+ 'bib' => $this->fixture('Class_Bib', ['id' => 4,
+ 'libelle' => 'Annecy'])]);
+
+ $article = $this->fixture('Class_Article',
+ ['id' => 12,
+ 'titre' => 'Inscrivez vous au Hackaton',
+ 'contenu' => 'Un évenement qui a la classe']);
+
+ $formulaire_de_tinguette = $this->fixture('Class_Formulaire',
+ ['id' => 3,
+ 'data' => serialize(['nom' => 'Tinguette',
+ 'prenom' => 'Quentine']),
+ 'date_creation' => '2012-12-05 12:00:23',
+ 'article' => $article,
+ 'validated' => false]);
+
+ $this->formulaire_de_bougie = $this->fixture('Class_Formulaire',
+ ['id' => 5,
+ 'data' => serialize(['nom' => 'Bougie',
+ 'Prenom' => 'Mireille']),
+ 'date_creation' => '2012-12-06 10:00:01',
+ 'article' => $article,
+ 'validated' => false,
+ 'user' => $zork]);
+
+ $formulaire_de_lefort = $this->fixture('Class_Formulaire',
+ ['id' => 6,
+ 'data' => serialize(['name' => 'Lefort',
+ 'prenom' => 'Nono',
+ 'age' => 12,
+ 'Securite-Sociale' => '789',
+ 'Budget_(TOTEM)_régional' => 'budget régional']),
+ 'date_creation' => '2012-11-06 17:00:01',
+ 'article' => $article]);
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Formulaire')
- ->whenCalled('delete')
- ->answers(true)
-
- ->whenCalled('delete')
- ->with($this->formulaire_de_bougie)
- ->answers(true)
-
- ->whenCalled('save')
- ->answers(true)
-
- ->whenCalled('save')
- ->with($this->formulaire_de_bougie)
- ->answers(true)
-
->whenCalled('findAllBy')
- ->with([ 'role' => 'article',
- 'model' => $article,
- 'order' => 'date_creation desc'])
+ ->with(['role' => 'article',
+ 'model' => $article,
+ 'order' => 'date_creation desc'])
->answers([$formulaire_de_tinguette,
$this->formulaire_de_bougie,
$formulaire_de_lefort])
@@ -90,13 +85,7 @@ abstract class ModoControllerFormulaireForArticleTestCase extends Admin_Abstract
->answers([$formulaire_de_lefort])
->whenCalled('countNotValidated')
- ->answers(1)
-
- ->whenCalled('find')
- ->with('5')
- ->answers($this->formulaire_de_bougie)
-
- ->beStrict();
+ ->answers(1);
}
}
@@ -310,16 +299,20 @@ class ModoControllerFormulaireExportCSVForArticlTest extends ModoControllerFormu
class ModoControllerFormulaireListTest extends Admin_AbstractControllerTestCase {
public function setUp() {
parent::setUp();
- $hackaton = Class_Article::newInstanceWithId(4, ['titre' => 'Inscrivez vous au Hackaton']);
- $preinscription = Class_Article::newInstanceWithId(2, ['titre' => 'Formulaire de préinscription']);
+ $hackaton = $this->fixture('Class_Article',
+ ['id' => 4,
+ 'titre' => 'Inscrivez vous au Hackaton',
+ 'contenu' => 'Car c\'est cool']);
+
+ $preinscription = $this->fixture('Class_Article',
+ ['id' => 2,
+ 'titre' => 'Formulaire de préinscription',
+ 'contenu' => 'pour se préinscrire']);
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Article')
->whenCalled('findAll')
->with('select id_article,titre from cms_article where id_article in (select distinct id_article from formulaires)')
- ->answers([
- $hackaton,
- $preinscription
- ]);
+ ->answers([$hackaton, $preinscription]);
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Formulaire')
->whenCalled('countBy')
@@ -355,7 +348,7 @@ class ModoControllerFormulaireListTest extends Admin_AbstractControllerTestCase
/** @test */
public function liShouldContainsLinkToFormulaireForHackaton() {
- $this->assertXPathContentContains('//div/ul/li[1]/a[contains(@href,"admin/modo/formulaires/id_article/4")]', 'Inscrivez vous au Hackaton [2/2]', $this->_response->getBody());
+ $this->assertXPathContentContains('//div/ul/li[1]/a[contains(@href,"admin/modo/formulaires/id_article/4")]', 'Inscrivez vous au Hackaton [2/2]');
}
@@ -367,7 +360,7 @@ class ModoControllerFormulaireListTest extends Admin_AbstractControllerTestCase
/** @test */
public function liShouldContainsLinkToFormulaireForPreinscription() {
- $this->assertXPathContentContains('//div/ul/li[2]/a[contains(@href,"admin/modo/formulaires/id_article/2")]', 'Formulaire de préinscription [1/4]',$this->_response->getBody());
+ $this->assertXPathContentContains('//div/ul/li[2]/a[contains(@href,"admin/modo/formulaires/id_article/2")]', 'Formulaire de préinscription [1/4]');
}
}
@@ -415,7 +408,6 @@ class ModoControllerFormulaireIndexWithOptionDesactivatedTest extends Admin_Abst
class ModoControllerFormulaireForArticleListTest extends ModoControllerFormulaireForArticleTestCase {
public function setUp() {
parent::setUp();
-
$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 87bdb241611..1f160261c1d 100644
--- a/tests/application/modules/opac/controllers/FormulaireControllerTest.php
+++ b/tests/application/modules/opac/controllers/FormulaireControllerTest.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-abstract class FormulaireControllerPostActionTestCase extends Admin_AbstractControllerTestCase {
+abstract class FormulaireControllerPostActionTestCase extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
--
GitLab