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:
authorStefan Giehl <stefan@matomo.org>2020-10-27 18:19:45 +0300
committerGitHub <noreply@github.com>2020-10-27 18:19:45 +0300
commiteb1543097d188c322b8470fea240fb62e39d01dd (patch)
tree542900fe35e0c24bb03fa1ea37326b34ec23259e /tests/PHPUnit/Framework
parent8f703bbc9d914d013c124d1e1d0f2ecd47d88ec4 (diff)
Adds possibility to force cookie less tracking (#16592)
* Add system and measurable setting to enable cookie less tracking * Never return a visitor id if cookieless tracking is forced * Adds custom tracker.js to prevent cookies * ignore exceptions * cache setting in site attributes for faster tracking * updates expected test files * ensure getVisitorId also works without idSite in request * fix js tests * store global cookie flag in config to avoid failures when building tracker js * use config instead of systemsetting * use a new event to update the tracker file * Fix handling in Request::getVisitorId() * improve setting descriptions * Revert "use config instead of systemsetting" This reverts commit 1fdfb6808415d2984726cedfe2644de31086f927. * Revert "store global cookie flag in config to avoid failures when building tracker js" This reverts commit 2587dbb851d3e44f2740e39c91af3213930cad6f. * code improvements * Reset storage to ensure it's not filled with invalid database objects * updates expected test files * Remove measurable setting again * move setting from systemsettings to ip anonymization settings * Show a warning if tracker file is not writable * updates expected test file * apply some review feedback * fix test * updates expected screenshot * apply review feedback * submodule update
Diffstat (limited to 'tests/PHPUnit/Framework')
-rw-r--r--tests/PHPUnit/Framework/Fixture.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 97258b3550..a74d04b8e6 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -324,6 +324,9 @@ class Fixture extends \PHPUnit\Framework\Assert
PiwikCache::getTransientCache()->flushAll();
+ // In some cases the Factory might be filled with settings that contain an invalid database connection
+ StaticContainer::getContainer()->set('Piwik\Settings\Storage\Factory', new \Piwik\Settings\Storage\Factory());
+
if ($this->overwriteExisting
|| !$this->isFixtureSetUp()
) {