From 1f1cba2517d568287bcbedd57ba3d90182e4ecf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ANDRE=20s=C3=A9bastien?= <sandre@afi-sa.fr>
Date: Thu, 13 Feb 2025 15:40:10 +0100
Subject: [PATCH] hotline#218292 : save attribute jour with good date format
---
VERSIONS_HOTLINE/218292 | 1 +
library/Class/Ouverture.php | 9 +-
.../Controller/Plugin/Manager/Manager.php | 1 -
.../controllers/OuverturesControllerTest.php | 397 +++++++++++-------
4 files changed, 256 insertions(+), 152 deletions(-)
create mode 100644 VERSIONS_HOTLINE/218292
diff --git a/VERSIONS_HOTLINE/218292 b/VERSIONS_HOTLINE/218292
new file mode 100644
index 00000000000..57cd39f91a8
--- /dev/null
+++ b/VERSIONS_HOTLINE/218292
@@ -0,0 +1 @@
+ - correctif #218292 : Admin : Ouvertures : Sauvegarder la date au format sélectionné par l'utilisateur.
\ No newline at end of file
diff --git a/library/Class/Ouverture.php b/library/Class/Ouverture.php
index 20488c74aae..3530e1d0673 100644
--- a/library/Class/Ouverture.php
+++ b/library/Class/Ouverture.php
@@ -88,9 +88,7 @@ class OuvertureLoader extends Storm_Model_Loader {
if (preg_match('/^(\d{4})-(\d{2})-(\d{2})/', $date))
return $date;
- return ($new_date = Class_Date::getHumanDate($date, 'yyyy-MM-dd'))
- ? $new_date
- : $this->humanDate($date);
+ return $this->humanDate($date);
}
@@ -186,9 +184,10 @@ class Class_Ouverture extends Storm_Model_Abstract {
}
- public function beforeSave() {
+ public function beforeSave()
+ {
if ($day = $this->getJour())
- $this->setJour(Class_Ouverture::getLoader()->humanDateToDate($day));
+ $this->setJour($this->getLoader()->humanDateToDate($day));
}
diff --git a/library/ZendAfi/Controller/Plugin/Manager/Manager.php b/library/ZendAfi/Controller/Plugin/Manager/Manager.php
index c7f9f41e9af..98714a00f79 100644
--- a/library/ZendAfi/Controller/Plugin/Manager/Manager.php
+++ b/library/ZendAfi/Controller/Plugin/Manager/Manager.php
@@ -176,7 +176,6 @@ class ZendAfi_Controller_Plugin_Manager_Manager extends ZendAfi_Controller_Plugi
public function editAction() {
-
if ($this->_response->isRedirect())
return null;
diff --git a/tests/application/modules/admin/controllers/OuverturesControllerTest.php b/tests/application/modules/admin/controllers/OuverturesControllerTest.php
index 088fe7364e3..3dc566571be 100644
--- a/tests/application/modules/admin/controllers/OuverturesControllerTest.php
+++ b/tests/application/modules/admin/controllers/OuverturesControllerTest.php
@@ -21,26 +21,27 @@
abstract class OuverturesControllerTestCase extends Admin_AbstractControllerTestCase {
+
protected
- $_storm_default_to_volatile = true,
$_ouverture_mardi_cran,
$_ouverture_jeudi_annecy,
$_ouverture_tous_mercredis_cran;
- public function setUp(): void {
+ public function setUp(): void
+ {
parent::setUp();
- $this->fixture('Class_Bib',
+ $this->fixture(Class_Bib::class,
['id' => 1,
'libelle' => 'Cran-Gévrier',
'horaire' => 'Non merci']);
- $this->fixture('Class_Bib',
+ $this->fixture(Class_Bib::class,
['id' => 3,
'libelle' => 'Annecy',
'horaire' => 'Ouvert 24/24']);
- $this->_ouverture_mardi_cran = $this->fixture('Class_Ouverture',
+ $this->_ouverture_mardi_cran = $this->fixture(Class_Ouverture::class,
['id' => 2,
'id_site' => 1,
'jour_semaine' => Class_Ouverture::AUCUN_JOUR,
@@ -51,18 +52,18 @@ abstract class OuverturesControllerTestCase extends Admin_AbstractControllerTest
'fin_apres_midi' => '17:00:00',
'label' => 'Anniversaire de francine']);
- $this->fixture('Class_Ouverture',
- ['id' => 21,
- 'id_site' => 1,
- 'jour_semaine' => Class_Ouverture::AUCUN_JOUR,
- 'jour' => '2012-07-24',
- 'debut_matin' => '00:00:00',
- 'fin_matin' => '00:00:00',
- 'debut_apres_midi' => '00:00:00',
- 'fin_apres_midi' => '00:00:00',
- 'label' => 'Repos après l\'anniversaire de francine']);
-
- $this->_ouverture_tous_mercredis_cran = $this->fixture('Class_Ouverture',
+ $this->fixture(Class_Ouverture::class,
+ ['id' => 21,
+ 'id_site' => 1,
+ 'jour_semaine' => Class_Ouverture::AUCUN_JOUR,
+ 'jour' => '2012-07-24',
+ 'debut_matin' => '00:00:00',
+ 'fin_matin' => '00:00:00',
+ 'debut_apres_midi' => '00:00:00',
+ 'fin_apres_midi' => '00:00:00',
+ 'label' => 'Repos après l\'anniversaire de francine']);
+
+ $this->_ouverture_tous_mercredis_cran = $this->fixture(Class_Ouverture::class,
['id' => 4,
'id_site' => 1,
'jour_semaine' => Class_Ouverture::MERCREDI,
@@ -71,40 +72,40 @@ abstract class OuverturesControllerTestCase extends Admin_AbstractControllerTest
'debut_apres_midi' => '12:00:00',
'fin_apres_midi' => '17:00:00']);
- $this->fixture('Class_Ouverture',
- ['id' => 5,
- 'id_site' => 1,
- 'jour_semaine' => Class_Ouverture::VENDREDI,
- 'debut_matin' => '10:00:00',
- 'fin_matin' => '12:00:00',
- 'debut_apres_midi' => '12:00:00',
- 'fin_apres_midi' => '17:00:00',
- 'label' => 'winter',
- 'validity_start' => '2017-12-01',
- 'validity_end' => '2018-01-01']);
-
- $this->fixture('Class_Ouverture',
- ['id' => 6,
- 'id_site' => 1,
- 'jour_semaine' => Class_Ouverture::SAMEDI,
- 'debut_matin' => '10:00:00',
- 'fin_matin' => '12:00:00',
- 'debut_apres_midi' => '12:00:00',
- 'fin_apres_midi' => '17:00:00',
- 'validity_start' => '2018-02-01',
- 'validity_end' => null]);
-
- $this->fixture('Class_Ouverture',
- ['id' => 7,
- 'id_site' => 1,
- 'jour_semaine' => Class_Ouverture::DIMANCHE,
- 'debut_matin' => '10:00:00',
- 'fin_matin' => '12:00:00',
- 'debut_apres_midi' => '12:00:00',
- 'fin_apres_midi' => '17:00:00',
- 'validity_end' => '2017-08-01']);
-
- $this->_ouverture_jeudi_annecy = $this->fixture('Class_Ouverture',
+ $this->fixture(Class_Ouverture::class,
+ ['id' => 5,
+ 'id_site' => 1,
+ 'jour_semaine' => Class_Ouverture::VENDREDI,
+ 'debut_matin' => '10:00:00',
+ 'fin_matin' => '12:00:00',
+ 'debut_apres_midi' => '12:00:00',
+ 'fin_apres_midi' => '17:00:00',
+ 'label' => 'winter',
+ 'validity_start' => '2017-12-01',
+ 'validity_end' => '2018-01-01']);
+
+ $this->fixture(Class_Ouverture::class,
+ ['id' => 6,
+ 'id_site' => 1,
+ 'jour_semaine' => Class_Ouverture::SAMEDI,
+ 'debut_matin' => '10:00:00',
+ 'fin_matin' => '12:00:00',
+ 'debut_apres_midi' => '12:00:00',
+ 'fin_apres_midi' => '17:00:00',
+ 'validity_start' => '2018-02-01',
+ 'validity_end' => null]);
+
+ $this->fixture(Class_Ouverture::class,
+ ['id' => 7,
+ 'id_site' => 1,
+ 'jour_semaine' => Class_Ouverture::DIMANCHE,
+ 'debut_matin' => '10:00:00',
+ 'fin_matin' => '12:00:00',
+ 'debut_apres_midi' => '12:00:00',
+ 'fin_apres_midi' => '17:00:00',
+ 'validity_end' => '2017-08-01']);
+
+ $this->_ouverture_jeudi_annecy = $this->fixture(Class_Ouverture::class,
['id' => 45,
'id_site' => 3,
'jour_semaine' => Class_Ouverture::AUCUN_JOUR,
@@ -118,9 +119,12 @@ abstract class OuverturesControllerTestCase extends Admin_AbstractControllerTest
class OuverturesControllerIndexActionSiteCranTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/index/id_site/1', true);
+
+ $this->dispatch('/admin/ouvertures/index/id_site/1');
}
@@ -252,12 +256,16 @@ class OuverturesControllerIndexActionSiteCranTest extends OuverturesControllerTe
-class OuverturesControllerIndexActionSiteCranMultimediaEnabledTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+class OuverturesControllerIndexActionSiteCranMultimediaEnabledTest
+ extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
Class_AdminVar::set('MULTIMEDIA_KEY', 'SECRET_KEY');
- $this->dispatch('/admin/ouvertures/index/id_site/1/used_for/1', true);
+ $this->dispatch('/admin/ouvertures/index/id_site/1/used_for/1');
}
@@ -272,6 +280,7 @@ class OuverturesControllerIndexActionSiteCranMultimediaEnabledTest extends Ouver
$this->assertXPathContentContains('//button','Ajouter une plage horaire de réservation multimédia');
}
+
/** @test */
public function backToBibLinkShouldNotContainScope(){
$this->assertXPath('//button[@class="back admin-button"][contains(@onclick, "/admin/bib\'")]');
@@ -280,10 +289,16 @@ class OuverturesControllerIndexActionSiteCranMultimediaEnabledTest extends Ouver
-class OuverturesControllerIndexActionSiteCranMultimediaDisabledTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+class OuverturesControllerIndexActionSiteCranMultimediaDisabledTest
+ extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/index/id_site/1/used_for/1', true);
+
+ $this->dispatch('/admin/ouvertures/index/id_site/1/used_for/1');
}
@@ -295,9 +310,13 @@ class OuverturesControllerIndexActionSiteCranMultimediaDisabledTest extends Ouve
+
class OuverturesControllerPostIndexActionSiteCranTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
+
$_SERVER['HTTP_REFERER'] = '/admin/ouvertures/index/id_site/1';
$this->postDispatch('/admin/ouvertures/index/id_site/1',
['closed_on_holidays' => '1']);
@@ -325,9 +344,15 @@ class OuverturesControllerPostIndexActionSiteCranTest extends OuverturesControll
-class OuverturesControllerPostIndexActionSiteCranWithMultimediaParamTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+class OuverturesControllerPostIndexActionSiteCranWithMultimediaParamTest
+ extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
+
$_SERVER['HTTP_REFERER'] = '/admin/ouvertures/index/id_site/1/used_for/1';
Class_AdminVar::set('MULTIMEDIA_KEY', 'SECRET_KEY');
$this->postDispatch('/admin/ouvertures/index/id_site/1/used_for/1',
@@ -344,9 +369,14 @@ class OuverturesControllerPostIndexActionSiteCranWithMultimediaParamTest extends
-class OuverturesControllerPostIndexActionSiteCranNotClosedTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+class OuverturesControllerPostIndexActionSiteCranNotClosedTest extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
+
$this->postDispatch('/admin/ouvertures/index/id_site/1',
['closed_on_holidays' => '0']);
Class_Bib::clearCache();
@@ -361,10 +391,14 @@ class OuverturesControllerPostIndexActionSiteCranNotClosedTest extends Ouverture
+
class OuverturesControllerIndexActionSiteAnnecyTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/index/id_site/3', true);
+
+ $this->dispatch('/admin/ouvertures/index/id_site/3');
}
@@ -411,8 +445,11 @@ class OuverturesControllerIndexActionSiteAnnecyTest extends OuverturesController
class OuverturesControllerDuplicateActionTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
+
$this->dispatch('/admin/ouvertures/duplicate/id_site/3/id/45');
}
@@ -439,9 +476,12 @@ class OuverturesControllerDuplicateActionTest extends OuverturesControllerTestCa
class OuverturesControllerIndexActionWithoutSiteTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/index', true);
+
+ $this->dispatch('/admin/ouvertures/index');
}
@@ -455,9 +495,12 @@ class OuverturesControllerIndexActionWithoutSiteTest extends OuverturesControlle
class OuverturesControllerEditOuvertureMardiTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/edit/id_site/1/id/2', true);
+
+ $this->dispatch('/admin/ouvertures/edit/id_site/1/id/2');
}
@@ -503,9 +546,13 @@ class OuverturesControllerEditOuvertureMardiTest extends OuverturesControllerTes
-class OuverturesControllerPostEditOuvertureMardiCranTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+class OuverturesControllerPostEditOuvertureMardiCranTest extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
+
$this->postDispatch('/admin/ouvertures/edit/id/2',
['id_site' => 1,
'debut_matin' => '10:30',
@@ -513,29 +560,34 @@ class OuverturesControllerPostEditOuvertureMardiCranTest extends OuverturesContr
'debut_apres_midi' => '14:00',
'fin_apres_midi' => '15:00',
'jour_semaine' => '0',
- 'jour' => '23/07/2012']);
+ 'jour' => '10/05/2012']);
}
+
/** @test */
- public function heureDebutMatinShouldBe_10_30() {
+ public function heureDebutMatinShouldBe_10_30()
+ {
$this->assertEquals('10:30', $this->_ouverture_mardi_cran->getDebutMatin());
}
/** @test */
- public function responseShouldRedirectToOuverturesIndexSiteOne() {
+ public function responseShouldRedirectToOuverturesIndexSiteOne()
+ {
$this->assertRedirectTo('/admin/ouvertures/index/id_site/1');
}
/** @test */
- public function jourShouldBe2012_07_23() {
- $this->assertEquals('2012-07-23', $this->_ouverture_mardi_cran->getJour());
+ public function jourShouldBe2012_05_10()
+ {
+ $this->assertEquals('2012-05-10', $this->_ouverture_mardi_cran->getJour());
}
/** @test */
- public function jourSemaineShouldBeZero() {
+ public function jourSemaineShouldBeZero()
+ {
$this->assertSame('0', $this->_ouverture_mardi_cran->getJourSemaine());
}
}
@@ -544,9 +596,12 @@ class OuverturesControllerPostEditOuvertureMardiCranTest extends OuverturesContr
class OuverturesControllerAddOuvertureCranTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/add/id_site/1', true);
+
+ $this->dispatch('/admin/ouvertures/add/id_site/1');
}
@@ -584,10 +639,16 @@ class OuverturesControllerAddOuvertureCranTest extends OuverturesControllerTestC
-class OuverturesControllerAddOuvertureCranMultimediaDisabledTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+class OuverturesControllerAddOuvertureCranMultimediaDisabledTest
+ extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->dispatch('/admin/ouvertures/add/id_site/1/used_for/1', true);
+
+ $this->dispatch('/admin/ouvertures/add/id_site/1/used_for/1');
}
/** @test */
@@ -598,12 +659,18 @@ class OuverturesControllerAddOuvertureCranMultimediaDisabledTest extends Ouvertu
-class OuverturesControllerAddOuvertureCranMultimediaEnabledTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+class OuverturesControllerAddOuvertureCranMultimediaEnabledTest
+ extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
+
Class_AdminVar::set('MULTIMEDIA_KEY', 'SECRET_KEY');
- $this->dispatch('/admin/ouvertures/add/id_site/1/used_for/1', true);
+ $this->dispatch('/admin/ouvertures/add/id_site/1/used_for/1');
}
@@ -635,11 +702,15 @@ class OuverturesControllerAddOuvertureCranMultimediaEnabledTest extends Ouvertur
+
class OuverturesControllerPostAddOuvertureCranTest extends OuverturesControllerTestCase {
+
protected $_new_ouverture;
- public function setUp(): void {
+ public function setUp(): void
+ {
parent::setUp();
+
$this->postDispatch('/admin/ouvertures/add/id_site/3', ['debut_matin' => '10:30',
'fin_matin' => '11:30',
'closed_am' => 0,
@@ -698,11 +769,17 @@ class OuverturesControllerPostAddOuvertureCranTest extends OuverturesControllerT
-class OuverturesControllerPostAddOuvertureCranMultimediaEnabledTest extends OuverturesControllerTestCase {
+
+class OuverturesControllerPostAddOuvertureCranMultimediaEnabledTest
+ extends OuverturesControllerTestCase
+{
+
protected $_new_ouverture;
- public function setUp(): void {
+ public function setUp(): void
+ {
parent::setUp();
+
Class_AdminVar::set('MULTIMEDIA_KEY', 'SECRET_KEY');
$this->postDispatch('/admin/ouvertures/add/used_for/1',
['debut_matin' => '10:30',
@@ -718,6 +795,7 @@ class OuverturesControllerPostAddOuvertureCranMultimediaEnabledTest extends Ouve
$this->_new_ouverture = Class_Ouverture::find(46);
}
+
/** @test */
public function responseShouldRedirectToOuverturesIndexSiteThree() {
$this->assertRedirectTo('/admin/ouvertures/index/id_site/3/used_for/1');
@@ -732,22 +810,22 @@ class OuverturesControllerPostAddOuvertureCranMultimediaEnabledTest extends Ouve
-class OuverturesControllerDispatchIndexWithLibraryAdminTest extends AbstractControllerTestCase {
- protected $_storm_default_to_volatile = true;
+class OuverturesControllerDispatchIndexWithLibraryAdminTest extends AbstractControllerTestCase {
- public function setUp(): void {
+ public function setUp(): void
+ {
parent::setUp();
- $this->fixture('Class_Bib',
- ['id' => 56,
- 'libelle' => 'Hem']);
+ $this->fixture(Class_Bib::class,
+ ['id' => 56,
+ 'libelle' => 'Hem']);
- $this->fixture('Class_Bib',
- ['id' => 89,
- 'libelle' => 'Lille']);
+ $this->fixture(Class_Bib::class,
+ ['id' => 89,
+ 'libelle' => 'Lille']);
- $monteux = $this->fixture('Class_Users',
+ $monteux = $this->fixture(Class_Users::class,
['id' => 89,
'login' => 'monteux',
'password' => 'ishould',
@@ -756,7 +834,7 @@ class OuverturesControllerDispatchIndexWithLibraryAdminTest extends AbstractCont
$monteux->beAdminBib()->save();
ZendAfi_Auth::getInstance()->logUser($monteux);
- $this->dispatch('/admin/ouvertures/index/id_site/56', true);
+ $this->dispatch('/admin/ouvertures/index/id_site/56');
}
@@ -768,9 +846,13 @@ class OuverturesControllerDispatchIndexWithLibraryAdminTest extends AbstractCont
+
class OuverturesControllerPostEmptyDayTestCase extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
+
$this->postDispatch('/admin/ouvertures/edit/id_site/3/id/4', ['debut_matin' => '10:30',
'fin_matin' => '11:30',
'debut_apres_midi' => '14:00',
@@ -789,15 +871,20 @@ class OuverturesControllerPostEmptyDayTestCase extends OuverturesControllerTestC
+
class OuverturesControllerPostTitiDayTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->postDispatch('/admin/ouvertures/edit/id_site/3/id/4', ['debut_matin' => '10:30',
- 'fin_matin' => '11:30',
- 'debut_apres_midi' => '14:00',
- 'fin_apres_midi' => '15:00',
- 'jour_semaine' => Class_Ouverture::AUCUN_JOUR,
- 'jour' => 'titi']);
+
+ $this->postDispatch('/admin/ouvertures/edit/id_site/3/id/4',
+ ['debut_matin' => '10:30',
+ 'fin_matin' => '11:30',
+ 'debut_apres_midi' => '14:00',
+ 'fin_apres_midi' => '15:00',
+ 'jour_semaine' => Class_Ouverture::AUCUN_JOUR,
+ 'jour' => 'titi']);
Class_Ouverture::clearCache();
}
@@ -810,16 +897,21 @@ class OuverturesControllerPostTitiDayTest extends OuverturesControllerTestCase {
-class OuverturesControllerEditWinterTuesdayOpeningsInCranTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+class OuverturesControllerEditWinterTuesdayOpeningsInCranTest extends OuverturesControllerTestCase
+{
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->fixture('Class_Ouverture',
+
+ $this->fixture(Class_Ouverture::class,
['id' => 456465,
'validity_start' => '2017-12-01',
'validity_end' => '2018-01-01',
'label' => 'Hiver']);
- $this->dispatch('/admin/ouvertures/edit/id/456465/id_site/3', true);
+ $this->dispatch('/admin/ouvertures/edit/id/456465/id_site/3');
}
@@ -846,7 +938,7 @@ class OuverturesControllerEditWinterTuesdayOpeningsInCranTest extends Ouvertures
}
-/** @test */
+ /** @test */
public function pageShouldNotContainsInputTextForMaxPerPeriodApresMidi() {
$this->assertNotXPath('//input[@type="text"][@name="max_per_period_apres_midi"]');
}
@@ -856,8 +948,11 @@ class OuverturesControllerEditWinterTuesdayOpeningsInCranTest extends Ouvertures
class OuverturesControllerPostValidityRangeTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
+
$this->postDispatch('/admin/ouvertures/edit/id_site/3/id/4',
['debut_matin' => '10:30',
'fin_matin' => '11:30',
@@ -893,16 +988,18 @@ class OuverturesControllerPostValidityRangeTest extends OuverturesControllerTest
class OuverturesControllerPostValidityRangeErrorsTest extends OuverturesControllerTestCase {
+
/** @test */
public function validityStartAfterValidityEndShouldRaiseError() {
- $this->postDispatch('/admin/ouvertures/edit/id_site/3/id/4', ['debut_matin' => '10:30',
- 'fin_matin' => '11:30',
- 'debut_apres_midi' => '14:00',
- 'fin_apres_midi' => '15:00',
- 'jour_semaine' => Class_Ouverture::LUNDI,
- 'jour' => '',
- 'validity_start' => '01/08/2016',
- 'validity_end' => '31/06/2016']);
+ $this->postDispatch('/admin/ouvertures/edit/id_site/3/id/4',
+ ['debut_matin' => '10:30',
+ 'fin_matin' => '11:30',
+ 'debut_apres_midi' => '14:00',
+ 'fin_apres_midi' => '15:00',
+ 'jour_semaine' => Class_Ouverture::LUNDI,
+ 'jour' => '',
+ 'validity_start' => '01/08/2016',
+ 'validity_end' => '31/06/2016']);
$this->assertXPathContentContains('//ul[@class="errors"]/li',
'La date de début doit être plus récente que la date de fin');
}
@@ -912,20 +1009,24 @@ class OuverturesControllerPostValidityRangeErrorsTest extends OuverturesControll
class OuverturesControllerPostClosedAMTest extends OuverturesControllerTestCase {
+
protected $_new_ouverture;
- public function setUp(): void {
+ public function setUp(): void
+ {
parent::setUp();
- $this->postDispatch('/admin/ouvertures/add/id_site/3', ['debut_matin' => '10:30',
- 'fin_matin' => '11:30',
- 'closed_am' => 1,
- 'debut_apres_midi' => '14:00',
- 'fin_apres_midi' => '15:00',
- 'closed_pm' => 1,
- 'jour_semaine' => Class_Ouverture::MARDI,
- 'jour' => '23/10/2012',
- 'validity_start' => '00/00/0000',
- 'validity_end' => '']);
+
+ $this->postDispatch('/admin/ouvertures/add/id_site/3',
+ ['debut_matin' => '10:30',
+ 'fin_matin' => '11:30',
+ 'closed_am' => 1,
+ 'debut_apres_midi' => '14:00',
+ 'fin_apres_midi' => '15:00',
+ 'closed_pm' => 1,
+ 'jour_semaine' => Class_Ouverture::MARDI,
+ 'jour' => '23/10/2012',
+ 'validity_start' => '00/00/0000',
+ 'validity_end' => '']);
$this->_new_ouverture = Class_Ouverture::find(46);
}
@@ -954,9 +1055,7 @@ class OuverturesControllerPostClosedAMTest extends OuverturesControllerTestCase
}
- /**
- * @test
- */
+ /** @test */
public function closedAMShouldNotStayInAttributes() {
try {
Class_Ouverture::find(46)->hasClosedAm();
@@ -966,9 +1065,7 @@ class OuverturesControllerPostClosedAMTest extends OuverturesControllerTestCase
}
- /**
- * @test
- */
+ /** @test */
public function closedPMShouldNotStayInAttributes() {
try {
Class_Ouverture::find(46)->hasClosedPm();
@@ -980,10 +1077,14 @@ class OuverturesControllerPostClosedAMTest extends OuverturesControllerTestCase
+
class OuverturesControllerEditActionWithClosedAMTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->fixture('Class_Ouverture',
+
+ $this->fixture(Class_Ouverture::class,
['id' => 456465,
'validity_start' => '2017-12-01',
'validity_end' => '2018-01-01',
@@ -993,9 +1094,10 @@ class OuverturesControllerEditActionWithClosedAMTest extends OuverturesControlle
'fin_apres_midi' => '00:00',
'label' => 'Hiver']);
- $this->dispatch('/admin/ouvertures/edit/id/456465/id_site/3', true);
+ $this->dispatch('/admin/ouvertures/edit/id/456465/id_site/3');
}
+
/** @test */
public function closedAMShouldBeChecked() {
$this->assertXPath('//input[@type="checkbox"][@name="closed_am"][@checked]');
@@ -1012,9 +1114,12 @@ class OuverturesControllerEditActionWithClosedAMTest extends OuverturesControlle
class OuverturesControllerIndexActionWithClosedAMTest extends OuverturesControllerTestCase {
- public function setUp(): void {
+
+ public function setUp(): void
+ {
parent::setUp();
- $this->fixture('Class_Ouverture',
+
+ $this->fixture(Class_Ouverture::class,
['id' => 456465,
'id_site' => 3,
'validity_start' => '2017-12-01',
@@ -1025,7 +1130,7 @@ class OuverturesControllerIndexActionWithClosedAMTest extends OuverturesControll
'fin_apres_midi' => '00:00',
'label' => 'Hiver']);
- $this->dispatch('/admin/ouvertures/index/id_site/3', true);
+ $this->dispatch('/admin/ouvertures/index/id_site/3');
}
--
GitLab