From e970fd6a15d6c29e522cca7e5b2739072ad2ffdc Mon Sep 17 00:00:00 2001
From: llaffont <laurent.laffont@gmail.com>
Date: Mon, 10 Mar 2014 10:46:09 +0100
Subject: [PATCH] Cms tests refactoring to use Storm fixtures
---
.../opac/controllers/CmsController.php | 2 +
library/Class/Article.php | 1 +
.../opac/controllers/CmsControllerTest.php | 72 +++++++++----------
3 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/application/modules/opac/controllers/CmsController.php b/application/modules/opac/controllers/CmsController.php
index 33d67029bd3..38f10a1a2d7 100644
--- a/application/modules/opac/controllers/CmsController.php
+++ b/application/modules/opac/controllers/CmsController.php
@@ -120,6 +120,8 @@ class CmsController extends Zend_Controller_Action {
$this->_redirect('opac/index', ['exit' => true]);
}
+ xdebug_break();
+
if ($article->isArchived() && !Class_Users::isCurrentUserCanAccesBackend()) {
throw new Zend_Controller_Action_Exception($this->view->_('Désolé, cette page n\'existe pas'), 404);
return;
diff --git a/library/Class/Article.php b/library/Class/Article.php
index d5f621715e6..b8810511c36 100644
--- a/library/Class/Article.php
+++ b/library/Class/Article.php
@@ -448,6 +448,7 @@ class Class_Article extends Storm_Model_Abstract {
protected $_overrided_attributes = ['id',
+ 'id_article',
'parent_id',
'article_original',
'langue',
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index 76706c9b4b1..372e4ed34fe 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -693,6 +693,31 @@ abstract class CmsControllerWithFeteDeLaFriteTestCase extends AbstractController
$avis_mimi->beWrittenByAbonne();
+
+ $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= $this->fixture('Class_Article',
['id' =>224,
'titre' => 'La fête de la frite',
@@ -701,46 +726,17 @@ abstract class CmsControllerWithFeteDeLaFriteTestCase extends AbstractController
'events_fin' => '2011-10-05 16:00',
'tags' => 'Tout public;Concert',
'lieu' => $annecy,
- '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();
-
+ 'categorie' =>$alimentaire,
+ 'avis' => 1,
+ 'avis_users' => [$avis_mimi,$avis_florence,$avis_anonyme]]);
+ $article_en = $this->fixture('Class_Article',
+ ['id' => 2241,
+ 'langue' => 'en',
+ 'parent_id' => 224,
+ 'titre' => 'Feast of fried',
+ 'contenu' => '<div>an appetizing feast</div>']);
- $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([
- $this->fixture('Class_Article',
- ['id' => 2241,
- 'langue' => 'en',
- 'parent_id' => 224,
- 'titre' => 'Feast of fried',
- 'contenu' => '<div>an appetizing feast</div>'])])
- ->setAvis(1);
- $article->setAvisUsers([$avis_mimi,$avis_florence,$avis_anonyme]);
- $article->save();
$this->fixture('Class_CmsRank',['id' => 987,
--
GitLab