diff options
author | JulienMoumne <julien@piwik.org> | 2012-09-06 23:21:15 +0400 |
---|---|---|
committer | JulienMoumne <julien@piwik.org> | 2012-09-06 23:21:15 +0400 |
commit | 63526ce1e3041ca94f8e6565f7f636e135033f06 (patch) | |
tree | 0405afdaf06d88e24b8885232181949fe745a331 /tests/PHPUnit/Integration | |
parent | 715d93037f840bb87eee3f45f1b39fe0a30f95ba (diff) |
refs #3323 - include images in scheduled reports only if system under test matches some technical characteristics of the Piwik QA Server
TODO
* update method 'canImagesBeIncludedInScheduledReports' to match the new Piwik QA server when it will be up and running
* build a vagrant VM with QA server specs, generate reports using it and override expected files
git-svn-id: http://dev.piwik.org/svn/trunk@6932 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'tests/PHPUnit/Integration')
-rwxr-xr-x | tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php | 6 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php index 4a809a3eaa..6d1594773c 100755 --- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php @@ -22,7 +22,6 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase parent::setUpBeforeClass(); try { self::setUpWebsitesAndGoals(); - self::setUpScheduledReports(self::$idSite); self::trackVisits(); } catch(Exception $e) { // Skip whole test suite if an error occurs while setup @@ -30,6 +29,11 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase } } + public function testSetUpScheduledReports() + { + $this->setUpScheduledReports(self::$idSite); + } + /** * @dataProvider getApiForTesting * @group Integration diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php index 8715fd57a9..2e4bdba820 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php @@ -30,7 +30,6 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ parent::setUpBeforeClass(); try { self::setUpWebsitesAndGoals(); - self::setUpScheduledReports(self::$idSite1); self::trackVisits(); } catch(Exception $e) { // Skip whole test suite if an error occurs while setup @@ -38,6 +37,11 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ } } + public function testSetUpScheduledReports() + { + $this->setUpScheduledReports(self::$idSite1); + } + /** * @dataProvider getApiForTesting * @group Integration |