diff options
author | Stefan Giehl <stefan@matomo.org> | 2022-04-14 15:14:47 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-14 15:14:47 +0300 |
commit | 4f780a6b1b698de15c1c68e2a72bed8ce0cb613b (patch) | |
tree | 56c7d7e8bb3dab664e850a2270659b6cb49acef5 /plugins/Live | |
parent | c9baad5f9502fe9ee4c70d94a21a1b3942398c62 (diff) |
Disable VisitorID segment site dependent (#19083)
* Disable VisitorID segment site dependent
* Adds tests
* fix test
Diffstat (limited to 'plugins/Live')
3 files changed, 55 insertions, 4 deletions
diff --git a/plugins/Live/tests/System/ApiTest.php b/plugins/Live/tests/System/ApiTest.php index 9236600a75..c8b26b7888 100644 --- a/plugins/Live/tests/System/ApiTest.php +++ b/plugins/Live/tests/System/ApiTest.php @@ -1,4 +1,5 @@ <?php + /** * Matomo - free/libre analytics platform * @@ -11,8 +12,10 @@ namespace Piwik\Plugins\Live\tests\System; use Piwik\Cache; use Piwik\Config; use Piwik\Plugins\API\API; +use Piwik\Plugins\Live\MeasurableSettings; use Piwik\Plugins\Live\SystemSettings; use Piwik\Plugins\Live\tests\Fixtures\ManyVisitsOfSameVisitor; +use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\SystemTestCase; /** @@ -225,9 +228,9 @@ class ApiTest extends SystemTestCase 'format' => 'xml', 'otherRequestParameters' => [ 'urls' => [ - urlencode("idSite=1&date=".self::$fixture->dateTime."&period=day&method=Live.getLastVisitsDetails"), - urlencode("idSite=1&date=".self::$fixture->dateTime."&period=day&method=API.getSuggestedValuesForSegment&segmentName=pageTitle"), - urlencode("idSite=1&date=".self::$fixture->dateTime."&period=day&method=Live.getVisitorProfile"), + urlencode("idSite=1&date=" . self::$fixture->dateTime . "&period=day&method=Live.getLastVisitsDetails"), + urlencode("idSite=1&date=" . self::$fixture->dateTime . "&period=day&method=API.getSuggestedValuesForSegment&segmentName=pageTitle"), + urlencode("idSite=1&date=" . self::$fixture->dateTime . "&period=day&method=Live.getVisitorProfile"), ] ], ] @@ -236,6 +239,45 @@ class ApiTest extends SystemTestCase return $apiToTest; } + public function testVisitorIdSegmentWithDisabledProfileForSite() + { + $settings = new SystemSettings(); + $settings->disableVisitorLog->setValue(false); + $settings->disableVisitorProfile->setValue(false); + $settings->save(); + + $settings = new MeasurableSettings(1); + $settings->disableVisitorLog->setValue(false); + $settings->disableVisitorProfile->setValue(true); + $settings->save(); + + $date = mktime(0, 0, 0, 1, 1, 2010); + $lookBack = ceil((time() - $date) / 86400); + API::$_autoSuggestLookBack = $lookBack; + + Fixture::clearInMemoryCaches(); + + $this->runApiTests('API.getSuggestedValuesForSegment', [ + 'idSite' => 1, + 'date' => self::$fixture->dateTime, + 'periods' => ['day'], + 'otherRequestParameters' => [ + 'segmentName' => 'visitorId', + ], + 'testSuffix' => 'disabledProfile' + ]); + + $this->runApiTests('API.getSuggestedValuesForSegment', [ + 'idSite' => 2, + 'date' => self::$fixture->dateTime, + 'periods' => ['day'], + 'otherRequestParameters' => [ + 'segmentName' => 'visitorId', + ], + 'testSuffix' => 'disabledProfile2' + ]); + } + public static function getOutputPrefix() { return ''; @@ -245,7 +287,6 @@ class ApiTest extends SystemTestCase { return dirname(__FILE__); } - } ApiTest::$fixture = new ManyVisitsOfSameVisitor(); diff --git a/plugins/Live/tests/System/expected/test_disabledProfile2__API.getSuggestedValuesForSegment.xml b/plugins/Live/tests/System/expected/test_disabledProfile2__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..073719ec4c --- /dev/null +++ b/plugins/Live/tests/System/expected/test_disabledProfile2__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>dbc0f004854457f5</row> +</result>
\ No newline at end of file diff --git a/plugins/Live/tests/System/expected/test_disabledProfile__API.getSuggestedValuesForSegment.xml b/plugins/Live/tests/System/expected/test_disabledProfile__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..ef5ac8ed46 --- /dev/null +++ b/plugins/Live/tests/System/expected/test_disabledProfile__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <error message="Requested segment visitorId not found. + + --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> +</result>
\ No newline at end of file |