diff options
| m--------- | plugins/AnonymousPiwikUsageMeasurement | 0 | ||||
| m--------- | plugins/CustomDimensions | 0 | ||||
| -rw-r--r-- | plugins/Login/tests/Integration/PasswordResetterTest.php | 1 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/CronArchiveTest.php | 2 |
4 files changed, 2 insertions, 1 deletions
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject f46ef6bf0269d8f551654463f4de14acf72bc16 +Subproject bccdf2e5edfd37bff42a70648780022732084bf diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 2ecb2118365014767394bd306f1057768f553ae +Subproject c2faedd237f2be8e27139a69ed04e051c87499b 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); } |