From 688e1751327b6322486ff391b6abf8a86f2ae1fc Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Thu, 3 Oct 2019 21:24:48 +0200 Subject: Fixes some failing tests (#14948) * Fix PasswordResetter tests * Adjust cronarchive test * updates submodules --- plugins/AnonymousPiwikUsageMeasurement | 2 +- plugins/CustomDimensions | 2 +- plugins/Login/tests/Integration/PasswordResetterTest.php | 1 + tests/PHPUnit/Integration/CronArchiveTest.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement index f46ef6bf02..bccdf2e5ed 160000 --- a/plugins/AnonymousPiwikUsageMeasurement +++ b/plugins/AnonymousPiwikUsageMeasurement @@ -1 +1 @@ -Subproject commit f46ef6bf0269d8f551654463f4de14acf72bc161 +Subproject commit bccdf2e5edfd37bff42a70648780022732084bfe diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions index 2ecb211836..c2faedd237 160000 --- a/plugins/CustomDimensions +++ b/plugins/CustomDimensions @@ -1 +1 @@ -Subproject commit 2ecb2118365014767394bd306f1057768f553ae1 +Subproject commit c2faedd237f2be8e27139a69ed04e051c87499b2 diff --git a/plugins/Login/tests/Integration/PasswordResetterTest.php b/plugins/Login/tests/Integration/PasswordResetterTest.php index 607316f91f..f3603c7aca 100644 --- a/plugins/Login/tests/Integration/PasswordResetterTest.php +++ b/plugins/Login/tests/Integration/PasswordResetterTest.php @@ -203,6 +203,7 @@ class PasswordResetterTest extends IntegrationTestCase 'observers.global' => [ ['Mail.send', function (Mail $mail) { $body = $mail->getBodyHtml(true); + $body = preg_replace('/=\n/', '', $body); preg_match('/resetToken[=\s]*3D([a-zA-Z0-9=\s]+)<\/p>/', $body, $matches); if (!empty($matches[1])) { $capturedToken = $matches[1]; diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index cf06c78e15..abef6f2258 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -107,7 +107,7 @@ class CronArchiveTest extends IntegrationTestCase $archiver->run(); $this->assertContains('Will skip segments archiving for today unless they were created recently', $logger->output); - $this->assertContains('Segment "actions>=1" was created recently and will therefore archive today', $logger->output); + $this->assertContains('Segment "actions>=1" was created or changed recently and will therefore archive today', $logger->output); $this->assertNotContains('Segment "actions>=2" was created recently', $logger->output); } -- cgit v1.2.3