Revert [7190] and [7464] while making sure tests that were not run before [7190] are still run.

git-svn-id: http://dev.piwik.org/svn/trunk@7465 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 2 insertions, 7 deletions

diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
index 96df2301cc..4c8b59a216 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
@@ -70,7 +70,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ
             'VisitorInterest.getNumberOfVisitsByDaysSinceLast');
     }
 
-    public function getApiForTesting( $testScheduledReports = true )
+    public function getApiForTesting()
     {
         $apiToCall       = $this->getApiToCall();
         $singlePeriodApi = array('VisitsSummary.get', 'Goals.get');
@@ -114,13 +114,8 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ
                                                 'testSuffix'   => '_' . $api . '_firstSite_lastN')
             );
         }
-        
-        if ($testScheduledReports)
-        {
-        	$result = array_merge($result, self::getApiForTestingScheduledReports(self::$dateTime, 'month'));
-        }
 
-        return $result;
+        return array_merge($result, self::getApiForTestingScheduledReports(self::$dateTime, 'month'));
     }
 
     public function getOutputPrefix()