diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-01-07 03:52:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 03:52:42 +0300 |
| commit | 4fc054b0219d4c1c35c47616536488d6ff10d0dd (patch) | |
| tree | 8c27cb0ebb16adcf27803a8be9c285fbbfb31f1f /plugins/ScheduledReports | |
| parent | d16f5b2de775cabcac62b518b1fa5f5908c5fd36 (diff) | |
Update submodules. (#13936)
* Update submodules.
* Update expected files.
* Fix more integration tests.
* Update submodule.
* Update screenshots.
Diffstat (limited to 'plugins/ScheduledReports')
| -rw-r--r-- | plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php | 6 | ||||
| -rw-r--r-- | plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php b/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php index 2c89da4134..cb55ffecd8 100644 --- a/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php +++ b/plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php @@ -52,7 +52,7 @@ class AttachedFileReportEmailGeneratorTest extends IntegrationTestCase $mail = $this->testInstance->makeEmail($generatedReport); $mailContent = $this->getMailContent($mail); - $this->assertStringStartsWith('=0A<html', $mail->getBodyHtml()->getContent()); + $this->assertStringStartsWith('<html', $mail->getBodyHtml()->getContent()); $this->assertEquals('General_Report report - pretty date', $mail->getSubject()); $this->assertContains('ScheduledReports_PleaseFindAttachedFile', $mailContent); $this->assertContains('ScheduledReports_SentFromX', $mailContent); @@ -99,7 +99,7 @@ Content-Disposition: inline; filename="General_Report report - pretty date.thing $mail = $this->testInstance->makeEmail($generatedReport); $mailContent = $this->getMailContent($mail); - $this->assertStringStartsWith('=0A<html', $mailContent); + $this->assertStringStartsWith('<html', $mailContent); $this->assertContains('ScheduledReports_PleaseFindAttachedFile', $mailContent); $this->assertEquals('Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable @@ -129,7 +129,7 @@ Content-Disposition: inline $mail = $this->testInstance->makeEmail($generatedReport); $mailContent = $this->getMailContent($mail); - $this->assertStringStartsWith('=0A<html', $mailContent); + $this->assertStringStartsWith('<html', $mailContent); $this->assertContains("ScheduledReports_PleaseFindAttachedFile", $mailContent); $this->assertContains('ScheduledReports_SentFromX=', $mailContent); $this->assertContains('ScheduledReports_CustomVisitorSegment', $mailContent); diff --git a/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php b/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php index 9b07e574ca..d2c3be30d1 100644 --- a/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php +++ b/plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php @@ -121,7 +121,7 @@ Content-Disposition: inline; filename="file2.txt" $this->assertEquals('test@testytesterson.com', $mail->getReplyTo()); $this->assertEquals([ 'From' => [ - 0 => 'ScheduledReports_PiwikReports <noreply@localhost>', + 0 => 'TagManager_MatomoTagName <noreply@localhost>', 'append' => true, ], 'Subject' => [ |