Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2019-10-03 22:24:48 +0300
committerGitHub <noreply@github.com>2019-10-03 22:24:48 +0300
commit688e1751327b6322486ff391b6abf8a86f2ae1fc (patch)
treefe51d7239030a8c7251532c7d6e33f6ea73e74ce /plugins
parent6b075bbb17aea5d119a13274617d905a1fc7a808 (diff)
Fixes some failing tests (#14948)
* Fix PasswordResetter tests * Adjust cronarchive test * updates submodules
Diffstat (limited to 'plugins')
m---------plugins/AnonymousPiwikUsageMeasurement0
m---------plugins/CustomDimensions0
-rw-r--r--plugins/Login/tests/Integration/PasswordResetterTest.php1
3 files changed, 1 insertions, 0 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];