diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2020-11-04 10:19:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 10:19:48 +0300 |
| commit | 375dd9f6933dcf7eeb37df9d2d9f44d16f35a277 (patch) | |
| tree | 135baa9b8f9f2b2758ab9adf899d4026b8a91218 /tests/PHPUnit/Fixtures | |
| parent | 6b12f37eb630d25dffa13e315b894abda80ed5af (diff) | |
several changes to emphasize setup and use of auto-archiving rather than real-time processing (#16603)
* several changes to emphasize setup and use of auto-archiving rather than real-time processing
* apply some pr feedback
* Applying more pr feedback.
* apply review fixes
* ignore ability to archive segments in real time
* another tweak
* update tests
* fix another test
* fix ui tests
* update test
* fix evolution icon bug
* Update TreemapVisualization and update expected screenshots
* update screenshots
Diffstat (limited to 'tests/PHPUnit/Fixtures')
| -rw-r--r-- | tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 4 | ||||
| -rw-r--r-- | tests/PHPUnit/Fixtures/UITestFixture.php | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 1d3a48f01e..3fdb404698 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -7,6 +7,7 @@ */ namespace Piwik\Tests\Fixtures; +use Piwik\Config; use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Plugins\SegmentEditor\API as APISegmentEditor; use Piwik\Plugins\UserCountry\LocationProvider; @@ -41,7 +42,10 @@ class ManySitesImportedLogs extends Fixture self::createSuperUser(); $this->trackVisits(); + + Config::getInstance()->General['enable_browser_archiving_triggering'] = 0; $this->setupSegments(); + Config::getInstance()->General['enable_browser_archiving_triggering'] = 1; } public function tearDown(): void diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php index 297fcaaa5a..aea7359f66 100644 --- a/tests/PHPUnit/Fixtures/UITestFixture.php +++ b/tests/PHPUnit/Fixtures/UITestFixture.php @@ -10,6 +10,7 @@ namespace Piwik\Tests\Fixtures; use Exception; use Piwik\API\Proxy; use Piwik\API\Request; +use Piwik\ArchiveProcessor\Rules; use Piwik\Columns\Dimension; use Piwik\Common; use Piwik\DataTable; @@ -444,6 +445,7 @@ class UITestFixture extends SqlDump public function createSegments() { + Rules::setBrowserTriggerArchiving(false); Db::exec("TRUNCATE TABLE " . Common::prefixTable('segment')); $segmentName = $this->xssTesting->forTwig('segment'); @@ -457,6 +459,7 @@ class UITestFixture extends SqlDump 'From Europe ' . $segmentName, "continentCode==eur", $idSite = 1, $autoArchive = false, $enabledAllUsers = true); APISegmentEditor::getInstance()->add( "Multiple actions", "actions>=2", $idSite = 1, $autoArchive = false, $enabledAllUsers = true); + Rules::setBrowserTriggerArchiving(true); } public function provideContainerConfig() |