From cd9dd5a36ab7c1d60959bf47903536a28b797aac Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@git-test.afi-sa.fr>
Date: Tue, 3 Dec 2013 13:29:18 +0000
Subject: [PATCH] Refacto tests sur les articles
---
.../admin/controllers/CmsControllerTest.php | 4 +-
.../opac/controllers/CmsControllerTest.php | 145 +++++++++---------
2 files changed, 71 insertions(+), 78 deletions(-)
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index bb0928a3d4c..8df4bfa4490 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -313,7 +313,7 @@ class CmsControllerArticleConcertAsAdminPortailEditActionTest extends CmsControl
/** @test */
public function datePickerJavascriptForDebutShouldBeDateOnlyTrue() {
$this->assertXPathContentContains('//script',
- '#datedebut").appendDtpicker({"dateFormat":"DD\/MM\/YYYY","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","dateOnly":true}');
+ '#datedebut").appendDtpicker({"dateFormat":"DD\/MM\/YYYY","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","autodateOnStart":false,"dateOnly":true}');
}
@@ -338,7 +338,7 @@ class CmsControllerArticleConcertAsAdminPortailEditActionTest extends CmsControl
/** @test */
public function datePickerJavascriptForEventDebutShouldBeDateOnlyFalse() {
$this->assertXPathContentContains('//script',
- '#dateevents_debut").appendDtpicker({"dateFormat":"DD\/MM\/YYYY hh:mm","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","dateOnly":false}');
+ '#dateevents_debut").appendDtpicker({"dateFormat":"DD\/MM\/YYYY hh:mm","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","autodateOnStart":false,"dateOnly":false}');
}
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index ae572af68e1..66e871abe18 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -535,95 +535,88 @@ abstract class CmsControllerWithFeteDeLaFriteTestCase extends AbstractController
public function setUp() {
parent::setUp();
- Class_AdminVar::getLoader()
- ->newInstanceWithId('MODO_AVIS_BIBLIO')
+ Class_AdminVar::newInstanceWithId('MODO_AVIS_BIBLIO')
->setValeur(0);
- Class_AdminVar::getLoader()
- ->newInstanceWithId('MODO_AVIS')
+ Class_AdminVar::newInstanceWithId('MODO_AVIS')
->setValeur(0);
+ $bonlieu = $this->fixture('Class_Bib', ['id' => 1,
+ 'libelle' => 'Bonlieu']);
+ $alimentaire = $this->fixture ( 'Class_ArticleCategorie', ['id' => 1,
+ 'libelle' => 'Alimentaire',
+ 'bib' => $bonlieu ]);
+
+ $avis_mimi = $this->fixture('Class_Avis' , ['id' => 34,
+ 'auteur' => $this->fixture('Class_Users' , ['id'=> 98,
+ 'pseudo' => 'Mimi',
+ 'password' => 'toto',
+ 'login' => 'mimi']),
+ 'date_avis' => '2012-02-05',
+ 'note'=>4,
+ 'entete' => "Hmmm",
+ 'avis'=> 'ça a l\'air bon'
+ ]);
+
+ $avis_mimi->beWrittenByAbonne();
+
+ $article= $this->fixture('Class_Article',['id' =>224,
+ 'titre' => 'La fête de la frite',
+ 'contenu' => '<div>Une fête appétissante</div>',
+ 'events_debut' => '2011-09-03',
+ 'events_fin' => '2011-10-05',
- Class_Article::newInstanceWithId(224)
- ->setTitre('La fête de la frite')
- ->setContenu('<div>Une fête appétissante</div>')
- ->setEventsDebut('2011-09-03')
- ->setEventsFin('2011-10-05')
- ->setCategorie(
- Class_ArticleCategorie::getLoader()->newInstanceWithId(1)
- ->setLibelle('Alimentaire')
- ->setBib(Class_Bib::getLoader()
- ->newInstanceWithId(1)
- ->setLibelle('Bonlieu')))
- ->setTraductions(array(Class_Article::getLoader()
- ->newInstanceWithId(2241)
- ->setLangue('en')
- ->setParentId(224)
- ->setTitre('Feast of fried')
- ->setContenu('<div>an appetizing feast</div>')))
+ 'categorie' =>$alimentaire]);
+
+ $avis_florence = $this->fixture('Class_Avis' , ['id' => 35,
+ 'auteur' => $this->fixture('Class_Users' , ['id'=> 123,
+ 'pseudo' => 'Florence',
+ 'password' => 'toto',
+ 'login' => 'florence']),
+ 'date_avis' => '2012-02-05',
+ 'note'=>2,
+ 'entete' => "Argg",
+ 'avis'=> 'ça ne me tente pas'
+
+ ]);
+
+ $avis_florence->beWrittenByBibliothecaire();
+
+
+
+ $avis_anonyme = $this->fixture('Class_Avis' , ['id' => 38,
+ 'auteur' => null,
+ 'date_avis' => '2012-02-05',
+ 'note'=>2,
+ 'entete' => "Anonyme",
+ 'avis'=> 'vous ne savez pas qui je suis'
+ ]);
+ $avis_anonyme->beWrittenByBibliothecaire();
+
+
+
+
+ $article->setTraductions(array(Class_Article::getLoader()
+ ->newInstanceWithId(2241)
+ ->setLangue('en')
+ ->setParentId(224)
+ ->setTitre('Feast of fried')
+ ->setContenu('<div>an appetizing feast</div>')))
->setAvis(1)
->setLieu(Class_Lieu::newInstanceWithId(3)
->setLibelle('Bonlieu')
->setAdresse('1, rue Jean Jaures')
->setCodePostal('74000')
->setVille('Annecy')
- ->setPays('France'))
- ->setAvisUsers([$avis_mimi = Class_Avis::getLoader()
- ->newInstanceWithId(34)
- ->setAuteur(Class_Users::getLoader()
- ->newInstanceWithId(98)
- ->setPseudo('Mimi'))
- ->setDateAvis('2012-02-05')
- ->setNote(4)
- ->setEntete('Hmmm')
- ->setAvis('ça a l\'air bon')
- ->beWrittenByAbonne(),
-
- $avis_florence = Class_Avis::getLoader()
- ->newInstanceWithId(35)
- ->setAuteur(Class_Users::getLoader()
- ->newInstanceWithId(123)
- ->setPseudo('Florence'))
- ->setDateAvis('2012-12-05')
- ->setNote(2)
- ->setEntete('Argg')
- ->setAvis('ça ne me tente pas')
- ->beWrittenByBibliothecaire(),
-
- $avis_anonyme = Class_Avis::getLoader()
- ->newInstanceWithId(38)
- ->setAuteur(null)
- ->setDateAvis('2012-12-12')
- ->setNote(2)
- ->setEntete('Anonyme')
- ->setAvis('vous ne savez pas qui je suis')
- ->beWrittenByBibliothecaire()]);
-
-
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_CmsRank')
- ->whenCalled('findFirstBy')
- ->answers(null)
-
- ->whenCalled('findFirstBy')
- ->with(array('id_cms' => 224))
- ->answers(Class_CmsRank::getLoader()->newInstanceWithId(987));
-
+ ->setPays('France'));
+ $article->setAvisUsers([$avis_mimi,$avis_florence,$avis_anonyme]);
+ $article->save();
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Avis')
- ->whenCalled('findAllBy')
- ->with(array(
- 'id_cms' => 224,
- 'order' => 'date_avis desc',
- 'abon_ou_bib' => 0))
- ->answers(array($avis_mimi))
+ $this->fixture('Class_CmsRank',['id' => 987,
+ 'article' => $article]);
- ->whenCalled('findAllBy')
- ->with(array(
- 'id_cms' => 224,
- 'order' => 'date_avis desc',
- 'abon_ou_bib' => 1))
- ->answers(array($avis_florence, $avis_anonyme));
+
}
}
@@ -736,7 +729,7 @@ class CmsControllerArticleViewAsAdminTest extends CmsControllerWithFeteDeLaFrite
/** @test */
public function avisShouldContainsEnteteArgg() {
- $this->assertXPathContentContains('//table[@class="avis"]//td', 'Argg');
+ $this->assertXPathContentContains('//table[@class="avis"]//td', 'Argg',$this->_response->getBody());
}
--
GitLab