From 2ec9be8b72db80851728c961f0285d8c3f56fa90 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Fri, 22 Jun 2012 13:08:40 +0000
Subject: [PATCH] Correction clash noms d'accesseurs sur les articles
---
library/Class/Article.php | 8 ++++----
.../modules/admin/controllers/CmsControllerTest.php | 6 +++---
tests/library/Class/AvisTest.php | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/library/Class/Article.php b/library/Class/Article.php
index fa0ac2cee11..608fd3c7bfb 100644
--- a/library/Class/Article.php
+++ b/library/Class/Article.php
@@ -391,10 +391,10 @@ class Class_Article extends Storm_Model_Abstract {
'role' => 'article_original',
'dependents' => 'delete'),
- 'avis' => array('model' => 'Class_Avis',
- 'role' => 'article',
- 'dependents' => 'delete',
- 'order' => 'date_avis desc'));
+ 'avis_users' => array('model' => 'Class_Avis',
+ 'role' => 'article',
+ 'dependents' => 'delete',
+ 'order' => 'date_avis desc'));
protected $_belongs_to = array('categorie' => array('model' => 'Class_ArticleCategorie',
'referenced_in' => 'id_cat'),
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index d36dd57006b..ea661001bf8 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -61,7 +61,8 @@ abstract class CmsControllerTestCase extends Admin_AbstractControllerTestCase {
->setTags('concert;jazz')
->setAvis(true)
->setIndexation(false)
- ->setDateCreation('2010-12-25');
+ ->setDateCreation('2010-12-25')
+ ->setAvisUsers(array());
$this->article_wrapper = Storm_Test_ObjectWrapper
@@ -1117,8 +1118,7 @@ class CmsControllerDeleteArticleTest extends CmsControllerTestCase {
->whenCalled('delete')
->answers(true);
-
- $this->dispatch('/admin/cms/delete/id/4');
+ $this->dispatch('/admin/cms/delete/id/4', true);
}
diff --git a/tests/library/Class/AvisTest.php b/tests/library/Class/AvisTest.php
index 254db0dd497..7d52a82cf26 100644
--- a/tests/library/Class/AvisTest.php
+++ b/tests/library/Class/AvisTest.php
@@ -77,8 +77,8 @@ class AvisCmsOnArticleConcertTest extends Storm_Test_ModelTestCase {
/** @test */
- public function concertGetAvisShouldAnswersArrayWithAvisLaurent() {
- $this->assertEquals(array($this->_avis_laurent), $this->_concert->getAvis());
+ public function concertGetAvisUsersShouldAnswersArrayWithAvisLaurent() {
+ $this->assertEquals(array($this->_avis_laurent), $this->_concert->getAvisUsers());
}
}
--
GitLab