From 1b0aad26a172986bee53004cd60a4fc066c96283 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 9 May 2017 15:46:20 +0200
Subject: [PATCH] dev #59734 fix tests failures
---
library/Class/Profil.php | 7 -------
library/ZendAfi/Form/Configuration/Profile.php | 3 ++-
.../ZendAfi/Form/Configuration/Profile/Page.php | 4 +++-
library/ZendAfi/Validate/ProfilRewriteUrl.php | 2 +-
.../admin/controllers/ProfilControllerTest.php | 15 ++++++---------
5 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index 871b055aadc..f39557b3c84 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -1383,13 +1383,6 @@ class Class_Profil extends Storm_Model_Abstract {
$this->_isCSSColorValid($this->getCouleurLienBandeau()),
$this->_('La couleur des liens du bandeau doit être au format #001122'));
-
- $validator = new ZendAfi_Validate_ProfilRewriteUrl();
- $validator->isValid($this);
- foreach($validator->getMessages() as $message) {
- $this->check(false, $message);
- }
-
return $this;
}
diff --git a/library/ZendAfi/Form/Configuration/Profile.php b/library/ZendAfi/Form/Configuration/Profile.php
index dd533357e39..ce470a6f547 100644
--- a/library/ZendAfi/Form/Configuration/Profile.php
+++ b/library/ZendAfi/Form/Configuration/Profile.php
@@ -71,7 +71,8 @@ formSelectToggleVisibilityForElement("#browser", $(".only_browser").closest("tr"
->addElement('text',
'rewrite_url',
- ['label' => $this->_('URL du profil')])
+ ['label' => $this->_('URL du profil'),
+ 'validators' => [new ZendAfi_Validate_ProfilRewriteUrl()]])
->addElement('userfile',
'header_img',
diff --git a/library/ZendAfi/Form/Configuration/Profile/Page.php b/library/ZendAfi/Form/Configuration/Profile/Page.php
index e1b7200e926..ade8e0c239c 100644
--- a/library/ZendAfi/Form/Configuration/Profile/Page.php
+++ b/library/ZendAfi/Form/Configuration/Profile/Page.php
@@ -30,9 +30,11 @@ class ZendAfi_Form_Configuration_Profile_Page extends ZendAfi_Form {
['label' => $this->_('Libelle'),
'required' => true,
'allowEmpty' => false])
+
->addElement('text',
'rewrite_url',
- ['label' => $this->_('URL de la page')])
+ ['label' => $this->_('URL de la page'),
+ 'validators' => [new ZendAfi_Validate_ProfilRewriteUrl()]])
->addElement('checkbox',
'use_parent_css',
diff --git a/library/ZendAfi/Validate/ProfilRewriteUrl.php b/library/ZendAfi/Validate/ProfilRewriteUrl.php
index 0c9b37c9fe0..af556b00c2c 100644
--- a/library/ZendAfi/Validate/ProfilRewriteUrl.php
+++ b/library/ZendAfi/Validate/ProfilRewriteUrl.php
@@ -33,7 +33,7 @@ class ZendAfi_Validate_ProfilRewriteUrl extends Zend_Validate_Abstract {
public function isValid($profil) {
- $this->_setValue($url = trim((string)$profil->getRewriteUrl()));
+ $this->_setValue($url = (string) $profil);
if (!$url)
return true;
diff --git a/tests/application/modules/admin/controllers/ProfilControllerTest.php b/tests/application/modules/admin/controllers/ProfilControllerTest.php
index 87efe78d2d7..b08441520db 100644
--- a/tests/application/modules/admin/controllers/ProfilControllerTest.php
+++ b/tests/application/modules/admin/controllers/ProfilControllerTest.php
@@ -1115,9 +1115,10 @@ class Admin_ProfilControllerPostAccueilPageMusiqueWithErrorsTest extends Admin_P
'preferences' => []]]]);
$this->postDispatch('/admin/profil/accueil/id_profil/23',
- ['saveContent' => 'box1|new|KIOSQUE|nb_notices=12/nb_analyse=36/only_img=1/;box2|new|CRITIQUES|',
+ ['division1' => 'KIOSQUE-0',
+ 'division2' => 'CRITIQUES-0',
'libelle' => 'Bonne Musique',
- 'rewrite_url' => 'music +(«8'], true);
+ 'rewrite_url' => 'music +(«8']);
}
@@ -1142,17 +1143,13 @@ class Admin_ProfilControllerPostAccueilPageMusiqueWithErrorsTest extends Admin_P
/** @test */
public function domainBrowserModuleShouldBeAvailable() {
- $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="DOMAIN_BROWSER"]','domaines');
+ $this->assertXPathContentContains('//li','domaines');
}
/** @test */
- public function boiteKiosqueShouldBeInDivisionOne() {
- $this->assertXPath('//ul[@id="box1"]/li[@id="KIOSQUE"]');
- }
-
- public function boiteCritiquesShouldBeInDivisionTwo() {
- $this->assertXPath('//ul[@id="box1"]/li[@id="CRITIQUES"]');
+ public function boiteSearchShouldBeInDivision4() {
+ $this->assertXPath('//div[@data-division="4"]//li[contains(@data-value, "RECH")]');
}
}
--
GitLab