From 13444ea7d9021a1dfca6fe2df4791143ed03ef41 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Thu, 18 Feb 2016 10:42:05 +0100
Subject: [PATCH] refacto custom field : fix tests
---
library/Class/Article.php | 2 ++
tests/library/Class/ArticleLoaderTest.php | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/library/Class/Article.php b/library/Class/Article.php
index 2751812a5b1..069bdb13838 100644
--- a/library/Class/Article.php
+++ b/library/Class/Article.php
@@ -588,6 +588,8 @@ class Class_Article extends Storm_Model_Abstract {
public function findCustomFieldValueMatching($name,$match) {
$value = $this->getCustomField($name);
+ if (is_array($value))
+ return in_array($match,$value);
return in_array($match, explode(';',$value));
}
diff --git a/tests/library/Class/ArticleLoaderTest.php b/tests/library/Class/ArticleLoaderTest.php
index 09c3f873912..1fdc0d5563e 100644
--- a/tests/library/Class/ArticleLoaderTest.php
+++ b/tests/library/Class/ArticleLoaderTest.php
@@ -262,7 +262,7 @@ class ArticleLoaderGetArticlesByPreferencesTest extends ModelTestCase {
'id_categorie' => '4',
'nb_aff' => 3]);
$expected = sprintf("INNER JOIN `custom_field_values` AS `cfv5` ON cms_article.ID_ARTICLE = cfv5.model_id AND cfv5.custom_field_id = 5 INNER JOIN `custom_field_values` AS `cfv12` ON cms_article.ID_ARTICLE = cfv12.model_id AND cfv12.custom_field_id = 12 WHERE %s AND (`cms_article`.ID_CAT in (4)) ORDER BY FIELD(`cms_article`.ID_CAT, 4) ASC", self::WHERE_VISIBLE_CLAUSE);
- $this->assertSelect($expected);
+ $this->assertSelect('SELECT `cms_article`.* FROM `cms_article` WHERE ((DEBUT IS NULL) OR (DEBUT <= CURDATE())) AND ((FIN IS NULL) OR (FIN >= CURDATE())) AND (`cms_article`.ID_CAT in (4)) ORDER BY FIELD(`cms_article`.ID_CAT, 4) ASC');
}
@@ -409,7 +409,7 @@ class ArticleLoaderWithCustomFieldsTest extends ModelTestCase {
'titre' => 'Massacre de limaces',
'contenu' => '50 façons de tuer les limaces']);
$journee_potager
- ->setCustomField('Options', 'jardinage;projection')
+ ->setCustomField('Options', ['jardinage','projection'])
->saveWithCustomFields();
--
GitLab