Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbenakamoorthi <benaka.moorthi@gmail.com>2012-11-14 04:47:42 +0400
committerbenakamoorthi <benaka.moorthi@gmail.com>2012-11-14 04:47:42 +0400
commit0223d19e9a3a6f1530963dc83d1279b4e2d62798 (patch)
treef8794b7291d3a1472e49f68ffe692a51c0dc2e57 /tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
parent57eee9b90d0cbd0560fcfd042488dbac1a9f0dd1 (diff)
Make sure scheduled reports are tested in TwoVisitors_TwoWebsites_DifferentDays but not in derived type TwoWebsites_DifferentDays_Conversions.
git-svn-id: http://dev.piwik.org/svn/trunk@7464 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php')
-rwxr-xr-xtests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
index 4c8b59a216..96df2301cc 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()
+ public function getApiForTesting( $testScheduledReports = true )
{
$apiToCall = $this->getApiToCall();
$singlePeriodApi = array('VisitsSummary.get', 'Goals.get');
@@ -114,8 +114,13 @@ 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 array_merge($result, self::getApiForTestingScheduledReports(self::$dateTime, 'month'));
+ return $result;
}
public function getOutputPrefix()