[WIP] matomo-org#2137 make tests pass.

cbuchli · Oct 10, 2016 · 0d49c04 · 0d49c04
1 parent a7e1ff4
commit 0d49c04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
@@ -37,11 +37,11 @@ class ScheduledReports extends \Piwik\Plugin
     const DISPLAY_FORMAT_TABLES_AND_GRAPHS = 3; // Display Tables and Graphs for all reports
     const DISPLAY_FORMAT_TABLES_ONLY = 4; // Display only tables for all reports
     const DEFAULT_DISPLAY_FORMAT = self::DISPLAY_FORMAT_GRAPHS_ONLY_FOR_KEY_METRICS;
-    const DEFAULT_DISPLAY_FLAT = false;
 
     const DEFAULT_REPORT_FORMAT = ReportRenderer::HTML_FORMAT;
     const DEFAULT_PERIOD = 'week';
     const DEFAULT_HOUR = '0';
+    const DEFAULT_DISPLAY_FLAT = false;
 
     const EMAIL_ME_PARAMETER = 'emailMe';
     const EVOLUTION_GRAPH_PARAMETER = 'evolutionGraph';
@@ -57,8 +57,8 @@ class ScheduledReports extends \Piwik\Plugin
         self::EMAIL_ME_PARAMETER          => false,
         self::EVOLUTION_GRAPH_PARAMETER   => false,
         self::ADDITIONAL_EMAILS_PARAMETER => false,
+        self::DISPLAY_FLAT_PARAMETER      => false,
         self::DISPLAY_FORMAT_PARAMETER    => true,
-        self::DISPLAY_FLAT_PARAMETER      => true,
     );
 
     private static $managedReportTypes = array(

diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php
@@ -73,6 +73,7 @@ public function testAddReportGetReports()
             'parameters'  => array(
                 'displayFormat'    => '1',
                 'emailMe'          => true,
+                'displayFlat'      => false,
                 'additionalEmails' => array('test@test.com', 't2@test.com'),
                 'evolutionGraph'   => true
             )
@@ -522,6 +523,7 @@ private static function getDailyPDFReportData($idSite)
             'parameters'  => array(
                 'displayFormat'    => '1',
                 'emailMe'          => true,
+                'displayFlat'      => false,
                 'additionalEmails' => array('test@test.com', 't2@test.com'),
                 'evolutionGraph'   => false
             )
@@ -541,6 +543,7 @@ private static function getMonthlyEmailReportData($idSite)
             'parameters'  => array(
                 'displayFormat'    => '1',
                 'emailMe'          => false,
+                'displayFlat'      => false,
                 'additionalEmails' => array('blabla@ec.fr'),
                 'evolutionGraph'   => false
             )