diff options
Diffstat (limited to 'plugins/ScheduledReports/tests')
| -rw-r--r-- | plugins/ScheduledReports/tests/Integration/ApiTest.php | 49 | ||||
| -rw-r--r-- | plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php | 12 |
2 files changed, 19 insertions, 42 deletions
diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php index 1284d17be0..e5bf8b3f20 100644 --- a/plugins/ScheduledReports/tests/Integration/ApiTest.php +++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php @@ -68,11 +68,11 @@ class ApiTest extends IntegrationTestCase ]; Piwik::addAction(APIScheduledReports::GET_REPORT_TYPES_EVENT, function (&$reportTypes) { - $reportTypes[] = 'dummyreporttype'; + $reportTypes['dummyreporttype'] = 'dummyreporttype.png'; }); Piwik::addAction(APIScheduledReports::GET_REPORT_FORMATS_EVENT, function (&$reportFormats) { - $reportFormats[] = 'dummyreportformat'; + $reportFormats['dummyreportformat'] = 'dummyreportformat.png'; }); Piwik::addAction(APIScheduledReports::GET_REPORT_METADATA_EVENT, function (&$availableReportData, $reportType, $idSite) { @@ -182,12 +182,8 @@ class ApiTest extends IntegrationTestCase */ public function testGetReportsIdReportNotFound() { - try { - APIScheduledReports::getInstance()->getReports($idSite = false, $period = false, $idReport = 1); - } catch (Exception $e) { - return; - } - $this->fail('Expected exception not raised'); + $this->expectException(Exception::class); + APIScheduledReports::getInstance()->getReports($idSite = false, $period = false, $idReport = 1); } /** @@ -195,17 +191,12 @@ class ApiTest extends IntegrationTestCase */ public function testGetReportsInvalidPermission() { - try { - APIScheduledReports::getInstance()->getReports( - $idSite = 44, - $period = false, - self::addReport(self::getDailyPDFReportData($this->idSite)) - ); - - } catch (Exception $e) { - return; - } - $this->fail('Expected exception not raised'); + $this->expectException(Exception::class); + APIScheduledReports::getInstance()->getReports( + $idSite = 44, + $period = false, + self::addReport(self::getDailyPDFReportData($this->idSite)) + ); } /** @@ -213,12 +204,8 @@ class ApiTest extends IntegrationTestCase */ public function testAddReportInvalidWebsite() { - try { - self::addReport(self::getDailyPDFReportData(33)); - } catch (Exception $e) { - return; - } - $this->fail('Expected exception not raised'); + $this->expectException(Exception::class); + self::addReport(self::getDailyPDFReportData(33)); } /** @@ -226,14 +213,10 @@ class ApiTest extends IntegrationTestCase */ public function testAddReportInvalidPeriod() { - try { - $data = self::getDailyPDFReportData($this->idSite); - $data['period'] = 'dx'; - self::addReport($data); - } catch (Exception $e) { - return; - } - $this->fail('Expected exception not raised'); + $this->expectException(Exception::class); + $data = self::getDailyPDFReportData($this->idSite); + $data['period'] = 'dx'; + self::addReport($data); } /** 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) |