diff options
| m--------- | plugins/AnonymousPiwikUsageMeasurement | 0 | ||||
| -rw-r--r-- | plugins/Goals/API.php | 4 | ||||
| -rw-r--r-- | plugins/Monolog/tests/System/TrackerLoggingTest.php | 5 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php | 33 |
4 files changed, 2 insertions, 40 deletions
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 49427328cc2d6e0987cedda0b122c5fad2a7bf5 +Subproject 4f57457a52bf6521fa662046f6585102245b770 diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index d840125007..32cc3a07e7 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -15,10 +15,8 @@ use Piwik\CacheId; use Piwik\Cache as PiwikCache; use Piwik\Common; use Piwik\DataTable; -use Piwik\Db; use Piwik\Metrics; use Piwik\Piwik; -use Piwik\Plugin\Report; use Piwik\Plugins\API\DataTable\MergeDataTables; use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate; use Piwik\Plugins\Goals\Columns\Metrics\AverageOrderRevenue; @@ -467,7 +465,7 @@ class API extends \Piwik\Plugin\API 'columns' => $columns, 'showAllGoalSpecificMetrics' => $showAllGoalSpecificMetrics, 'format_metrics' => Common::getRequestVar('format_metrics', 'bc'), - )); + ), $default = []); $tableSegmented->filter('Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames', array($appendToMetricName)); diff --git a/plugins/Monolog/tests/System/TrackerLoggingTest.php b/plugins/Monolog/tests/System/TrackerLoggingTest.php index 44a7755e9f..0942be7560 100644 --- a/plugins/Monolog/tests/System/TrackerLoggingTest.php +++ b/plugins/Monolog/tests/System/TrackerLoggingTest.php @@ -76,10 +76,7 @@ class TrackerLoggingTest extends SystemTestCase { $response = $t->doTrackPageView('incredible title!'); - $this->assertStringStartsWith("DEBUG: Debug enabled - Input parameters: array ( - 'idsite' => '1', - 'rec' => '1', - 'apiv' => '1',", $response); + $this->assertRegExp('/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] ' . preg_quote("piwik.DEBUG: Debug enabled - Input parameters: array ( 'idsite' => '1', 'rec' => '1', 'apiv' => '1',") . "/", $response); } private function setTrackerConfig($trackerConfig) diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php index 36365b7c49..e5d60efddd 100644 --- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php +++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php @@ -201,39 +201,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase $this->assertSame($expected, $reports); } - public function test_markArchivesAsInvalidated_shouldSkipArchivingForInProgressSites() - { - /** @var ArchivingStatus $archivingStatus */ - $archivingStatus = StaticContainer::get(ArchivingStatus::class); - - $params = new Parameters(new Site(7), Factory::build('month', '2012-02-03'), new Segment('', [2])); - $archivingStatus->archiveStarted($params); - - $params = new Parameters(new Site(5), Factory::build('day', '2012-02-03'), new Segment('', [7])); - $archivingStatus->archiveStarted($params); - - $this->rememberReportsForManySitesAndDates(); - - $idSites = array(2, 10, 7, 5); - $dates = array( - Date::factory('2014-04-05'), - Date::factory('2014-04-08'), - Date::factory('2014-05-05'), - ); - - $this->invalidator->markArchivesAsInvalidated($idSites, $dates, 'week'); - $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated(); - - $expected = array( - '2014-04-05' => [1,4,7], - '2014-04-06' => [3], - '2014-05-05' => [5], - '2014-04-08' => [7], - '2014-05-08' => [7], - ); - $this->assertSame($expected, $reports); - } - private function rememberReport($idSite, $date) { $date = Date::factory($date); |