From f092d3b20289e8f6844674779b7b8b475e553cd1 Mon Sep 17 00:00:00 2001
From: Benaka <diosmosis@users.noreply.github.com>
Date: Thu, 23 Nov 2017 16:58:22 -0800
Subject: Use consistent HTML email body for all scheduled reports (HTML, PDF &
 CSV) (#12233)

* Extract mail configuring parts of sendReport method & write tests for them.

* Use twig in AttachedFileReportEmailGenerator.

* Extract header/footer of html scheduled report email into re-usable View subclasses & use for PDF/CSV emails.

* Fixing test failures.

* Integrationt est
---
 ...olution_graph__ScheduledReports.generateReport_month.original.html | 4 ++--
 ...les_and_graph__ScheduledReports.generateReport_month.original.html | 4 ++--
 ...l_tables_only__ScheduledReports.generateReport_month.original.html | 4 ++--
 ...volution_graph__ScheduledReports.generateReport_week.original.html | 4 ++--
 ...bles_and_graph__ScheduledReports.generateReport_week.original.html | 4 ++--
 ...ml_tables_only__ScheduledReports.generateReport_week.original.html | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests/PHPUnit')

diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
index f9b00e6273..bc0c63f737 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
@@ -32,8 +32,8 @@
     </h2>
 
     <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; '>
-        Please find below your day report for Site 1.
-        <br />Mail Test report
+                Please find below your day report for Site 1.
+                <br />Mail Test report
         <br />Date range: January 2010
         <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/.
     </p>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 5135698bdc..b3907eca2f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -32,8 +32,8 @@
     </h2>
 
     <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; '>
-        Please find below your day report for Site 1.
-        <br />Mail Test report
+                Please find below your day report for Site 1.
+                <br />Mail Test report
         <br />Date range: January 2010
         <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/.
     </p>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index d503e5ebd0..ad317c6dd0 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -32,8 +32,8 @@
     </h2>
 
     <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; '>
-        Please find below your day report for Site 1.
-        <br />Mail Test report
+                Please find below your day report for Site 1.
+                <br />Mail Test report
         <br />Date range: January 2010
         <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/.
     </p>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
index 3cc46fd0ad..4302aed3be 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
@@ -32,8 +32,8 @@
     </h2>
 
     <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; '>
-        Please find below your day report for Piwik test.
-        <br />Mail Test report
+                Please find below your day report for Piwik test.
+                <br />Mail Test report
         <br />Date range: week April 4 – 10, 2011
         <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/.
     </p>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index a6c31c80a0..8a6c167ef7 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -32,8 +32,8 @@
     </h2>
 
     <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; '>
-        Please find below your day report for Piwik test.
-        <br />Mail Test report
+                Please find below your day report for Piwik test.
+                <br />Mail Test report
         <br />Date range: week April 4 – 10, 2011
         <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/.
     </p>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 0a0b0ba34f..552ff56ce2 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -32,8 +32,8 @@
     </h2>
 
     <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; '>
-        Please find below your day report for Piwik test.
-        <br />Mail Test report
+                Please find below your day report for Piwik test.
+                <br />Mail Test report
         <br />Date range: week April 4 – 10, 2011
         <br />Sent from http://example.com/piwik/tests/PHPUnit/proxy/.
     </p>
-- 
cgit v1.2.3