From c529a6017465281f5862153abfccc87c4ee62561 Mon Sep 17 00:00:00 2001 From: gloas <gloas@afi-sa.fr> Date: Mon, 15 May 2017 11:43:58 +0200 Subject: [PATCH] dev #40650 fix tests failures --- .../modules/admin/controllers/CmsControllerTest.php | 4 ++-- .../controllers/AuthControllerPreRegistrationTest.php | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php index f172bfc9248..bd2cdf5cbb9 100644 --- a/tests/application/modules/admin/controllers/CmsControllerTest.php +++ b/tests/application/modules/admin/controllers/CmsControllerTest.php @@ -412,7 +412,7 @@ class CmsControllerArticleConcertAsAdminPortailEditActionTest extends CmsControl /** @test */ public function datePickerJavascriptForDebutShouldBeDateOnlyTrue() { $this->assertXPathContentContains('//script', - 'input#debut").appendDtpicker({"dateFormat":"DD\/MM\/YYYY","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","autodateOnStart":false,"dateOnly":true}'); + 'input#debut").appendDtpicker({"dateFormat":"dd\/MM\/YYYY","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","autodateOnStart":false,"dateOnly":true}'); } @@ -437,7 +437,7 @@ class CmsControllerArticleConcertAsAdminPortailEditActionTest extends CmsControl /** @test */ public function datePickerJavascriptForEventDebutShouldBeDateOnlyFalse() { $this->assertXPathContentContains('//script', - 'input#events_debut").appendDtpicker({"dateFormat":"DD\/MM\/YYYY hh:mm","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","autodateOnStart":false,"dateOnly":false}'); + 'input#events_debut").appendDtpicker({"dateFormat":"dd\/MM\/YYYY hh:mm","locale":"fr","firstDayOfWeek":1,"minuteInterval":15,"closeOnSelected":"true","autodateOnStart":false,"dateOnly":false}'); } diff --git a/tests/application/modules/opac/controllers/AuthControllerPreRegistrationTest.php b/tests/application/modules/opac/controllers/AuthControllerPreRegistrationTest.php index 0cfbf2a1e10..d655b9f169d 100644 --- a/tests/application/modules/opac/controllers/AuthControllerPreRegistrationTest.php +++ b/tests/application/modules/opac/controllers/AuthControllerPreRegistrationTest.php @@ -34,6 +34,13 @@ abstract class AuthControllerPreRegistrationTestCase extends AbstractControllerT $this->mock_web_client = $this->mock(); } + + + public function tearDown() { + $this->mock_transport = null; + $this->mock_web_client = null; + parent::tearDown(); + } } @@ -336,7 +343,7 @@ class AuthControllerPreRegistrationNanookPostDispatchTest /** @test */ - public function mailSubjectShouldBePréinscriptionÀLaMédiathèqueDeGrans() { + public function mailSubjectShouldBePréinscriptionÀArcadia() { $this->assertEquals('Préinscription à Arcadia', $this->mock_transport->getSentMails()[0]->getSubject()); } } @@ -379,7 +386,7 @@ class AuthControllerPreRegistrationNanookPostDispatchErrorTest /** @test */ public function responseShouldRedirectToPreRegistrationError() { - $this->assertRedirectTo('http://localhost' . BASE_URL . '/auth/pre-registration/site/1/lastName/Jiro/firstName/Tom/mail/test%40test.fr/mail2/test%40test.fr/password/pwd123456/password2/pwd123456/birthDate/.2001-05-05/town/titi/zipcode/123456/address/123'); + $this->assertRedirectTo('http://localhost' . BASE_URL . '/auth/pre-registration/site/1/lastName/Jiro/firstName/Tom/mail/test%40test.fr/mail2/test%40test.fr/password/pwd123456/password2/pwd123456/birthDate/2001-05-05/town/titi/zipcode/123456/address/123'); } } -- GitLab