From 06a11c390a45c6f2205354334e39a43c94232bca Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Mon, 23 Jan 2017 12:09:14 +0100
Subject: [PATCH] hotline #52287 test fix
---
library/Class/WebService/ICalendar.php | 6 +++---
tests/scenarios/ExternalAgendas/ExternalAgendasTest.php | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/library/Class/WebService/ICalendar.php b/library/Class/WebService/ICalendar.php
index 51c52e71cb7..e9a3df47864 100644
--- a/library/Class/WebService/ICalendar.php
+++ b/library/Class/WebService/ICalendar.php
@@ -36,10 +36,10 @@ class Class_WebService_ICalendar extends Class_WebService_Abstract {
$ics_content = $this->httpGet($external_agenda->getUrl());
- $ics_content = preg_replace('|\r\n\s|', '', $ics_content); //see RFC2445
+ $ics_content = preg_replace('|\n\s|', '', $ics_content); //see RFC2445
+ $lines = preg_split('|\r?\n|', $ics_content);
- array_map([$this, '_importLine'],
- explode("\r\n", $ics_content));
+ array_map([$this, '_importLine'], $lines);
return $this->_events;
}
diff --git a/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php b/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php
index 3a9a882bb37..fc6a057b2b2 100644
--- a/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php
+++ b/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php
@@ -490,8 +490,7 @@ class ExternalAgendasAdminImportTest extends ExternalAgendasAdminTestCase {
/** @test */
public function pageShouldContainsABackButton() {
$this->assertXPathContentContains('//div[contains(@onclick, "replace(\'/admin/external-agendas\')")]//td',
- 'Retour à la liste des agendas',
- $this->_response->getBody());
+ 'Retour à la liste des agendas');
}
--
GitLab