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>2021-08-17 10:58:59 +0300
committerGitHub <noreply@github.com>2021-08-17 10:58:59 +0300
commit0829d6e6ac487bf47e4197123d6683b271db8266 (patch)
tree77f8edd0c326b29c50d9fefd174cd45d5ebcbc92 /plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php
parent8c7fa7d8d414b5201c36661fb4828d14e4c33c53 (diff)
Run AllTests on PHP8 (#16897)
* Run AllTests on PHP8 * use newer phpunit for tests on PHP8 * fix notices/errors * handle trace of phpunit 9 * ensure to compare same types for range check * adjust expected result for php8 * try handling hasDependencies does not exist in PHPUnit 9 * fix: ArgumentCountError: mysqli_stmt::bind_param() does not accept unknown named parameters * Fix usercountry tests * remove incorrect date check * fix expected exception message * fix referrers api test for php8 * add test hint * try to fix session related tests * debug test failure * try to fix mail tests * fix filterUser method * exlucde phpunit from build size calculation * fix scheduled reports test * update release checklist test * unset climode * improves some tests
Diffstat (limited to 'plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php')
-rw-r--r--plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php b/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php
index 38653743bf..b56a958ce9 100644
--- a/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php
+++ b/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php
@@ -67,9 +67,7 @@ class AttachedFileReportEmailGeneratorTest extends IntegrationTestCase
$this->assertEquals('General_Report report - pretty date', $mail->getSubject());
self::assertStringContainsString('ScheduledReports_PleaseFindAttachedFile', $mailContent);
self::assertStringContainsString('ScheduledReports_SentFromX', $mailContent);
- $this->assertStringContainsString("Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-", $this->mail->createBody());
+ self::assertStringContainsString("Content-Type: text/html; charset=utf-8" . PHPMailer::getLE() . "Content-Transfer-Encoding: quoted-printable" . PHPMailer::getLE(), $this->mail->createBody());
$attachments = $this->mail->getAttachments();
$this->assertEquals([
@@ -109,9 +107,7 @@ Content-Transfer-Encoding: quoted-printable
$this->assertStringStartsWith('<html', $mailContent);
self::assertStringContainsString('ScheduledReports_PleaseFindAttachedFile', $mailContent);
- $this->assertStringContainsString("Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-", $this->mail->createBody());
+ self::assertStringContainsString("Content-Type: text/html; charset=utf-8" . PHPMailer::getLE() . "Content-Transfer-Encoding: quoted-printable" . PHPMailer::getLE(), $this->mail->createBody());
}
public function test_makeEmail_AddsSegmentInformation_IfReportIsForSavedSegment()
@@ -140,9 +136,7 @@ Content-Transfer-Encoding: quoted-printable
self::assertStringContainsString("ScheduledReports_PleaseFindAttachedFile", $mailContent);
self::assertStringContainsString('ScheduledReports_SentFromX', $mailContent);
self::assertStringContainsString('ScheduledReports_CustomVisitorSegment', $mailContent);
- $this->assertStringContainsString("Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-", $this->mail->createBody());
+ self::assertStringContainsString("Content-Type: text/html; charset=utf-8" . PHPMailer::getLE() . "Content-Transfer-Encoding: quoted-printable" . PHPMailer::getLE(), $this->mail->createBody());
}
private function getMailContent(Mail $mail)