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:
authordizzy <diosmosis@users.noreply.github.com>2021-05-31 03:57:53 +0300
committerGitHub <noreply@github.com>2021-05-31 03:57:53 +0300
commite0417845f8fd7031e00e97c3576415c998abb2ce (patch)
treebcb32121d164b62229209534538f8ca7c2bf6705 /tests/PHPUnit/Unit
parent30eec9445b0a2117f80305f7a367121039f04817 (diff)
Allow overriding some Tracker config by idSite (#17636)
* Allow tracker config to be customized per site (for some configs) * Update Response.php * allow few more settings to be overwritten on a per site basis * idsite parameter may not be specified during Tracker\Request::__construct() (eg, during bulk tracking) * Fix another test. * Just make idsite optional for TrackerConfig::getConfigValue() calls. * try to fix remaining failure * forgot to add test file Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Diffstat (limited to 'tests/PHPUnit/Unit')
-rw-r--r--tests/PHPUnit/Unit/Tracker/RequestSetTest.php3
-rw-r--r--tests/PHPUnit/Unit/Tracker/TrackerConfigTest.php32
2 files changed, 34 insertions, 1 deletions
diff --git a/tests/PHPUnit/Unit/Tracker/RequestSetTest.php b/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
index 43bcecee4e..4773478b64 100644
--- a/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
+++ b/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
@@ -8,6 +8,7 @@
namespace Piwik\Tests\Unit\Tracker;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
use Piwik\Tracker\Request;
use Piwik\Tracker\RequestSet;
@@ -15,7 +16,7 @@ use Piwik\Tracker\RequestSet;
* @group RequestSetTest
* @group Tracker
*/
-class RequestSetTest extends \PHPUnit\Framework\TestCase
+class RequestSetTest extends UnitTestCase
{
/**
* @var TestRequestSet
diff --git a/tests/PHPUnit/Unit/Tracker/TrackerConfigTest.php b/tests/PHPUnit/Unit/Tracker/TrackerConfigTest.php
new file mode 100644
index 0000000000..e2ac9fe363
--- /dev/null
+++ b/tests/PHPUnit/Unit/Tracker/TrackerConfigTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Tracker;
+
+use Piwik\Config;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Piwik\Tracker\TrackerConfig;
+
+class TrackerConfigTest extends UnitTestCase
+{
+ public function test_getConfigValue_returnsTrackerConfigValue_ifNoSiteSpecificValue()
+ {
+ Config::getInstance()->Tracker['setting'] = 1;
+ Config::getInstance()->Tracker_10['setting'] = 0;
+
+ $this->assertEquals(1, TrackerConfig::getConfigValue('setting', 5));
+ }
+
+ public function test_getConfigValue_returnsSiteSpecificConfigValue_ifOneIsSpecified()
+ {
+ Config::getInstance()->Tracker['setting'] = 1;
+ Config::getInstance()->Tracker_10['setting'] = 0;
+
+ $this->assertEquals(0, TrackerConfig::getConfigValue('setting', 10));
+ }
+} \ No newline at end of file