diff options
author | Stefan Giehl <stefan@matomo.org> | 2020-07-01 10:21:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-01 10:21:41 +0300 |
commit | c6bb7314071c18cf0ef54a4e35d3531314e68792 (patch) | |
tree | 8bc6290c4335fdb2088398d99bab072177f0c0b6 /tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | |
parent | 680ffd796ea93e1b5e7699d126c7c5262ed0e851 (diff) |
Removes CustomVariables plugin from core (#16090)
* Removes CustomVariables plugin
* removes CustomVariables plugin from core list
* Move methods to get custom variables from request to the plugin
* define visit fields to persist in plugin
* do not use custom variables plugin if not available
* adjust test requirements for CustomVariables plugin
* Only execute update if plugin is installed
* do not consider custom variables widget as api in tests
* move autosuggest tests for custom variables to plugin
* do not use custom variable segments in core tests
* move multi column segment test to custom variables plugin
* do not use custom variable segment in archive cron test
* update access log to use new product view parameters instead of custom variables
* move some custom variables based tests to plugin
* Use Contents API instead of CustomVariables for CSV export tests
* skip some tests if CustomVariables plugin is not available
* Adjust tracker code generator tests to work without custom variables plugin
* [TEMP] remove custom variables from system test output
* adjust some tests to run without custom variables plugin
* apply some review feedback
* Readds Custom Variables as submodule (#16104)
* Adds CustomVariables as submodule
* Revert "[TEMP] remove custom variables from system test output"
This reverts commit 30b56dc135b6c130c841306f739dbcd7d9f4a366.
* use submodule branch
* test changes due to loading CustomVariables as submodule (plugin order)
* updates some expected screenshots
* improve test fixture
* submodule update
Diffstat (limited to 'tests/PHPUnit/Fixtures/ManySitesImportedLogs.php')
-rw-r--r-- | tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index aa0bb583de..c58528bc07 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -7,7 +7,6 @@ */ namespace Piwik\Tests\Fixtures; -use Piwik\Plugins\GeoIp2\LocationProvider\GeoIp2; use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Plugins\SegmentEditor\API as APISegmentEditor; use Piwik\Plugins\UserCountry\LocationProvider; @@ -84,7 +83,7 @@ class ManySitesImportedLogs extends Fixture 'autoArchive' => true, 'enabledAllUsers' => true), - 'segmentNoAutoArchive' => array('definition' => 'customVariableName1==Not-bot', + 'segmentNoAutoArchive' => array('definition' => 'deviceBrand==Apple', 'idSite' => false, 'autoArchive' => false, 'enabledAllUsers' => true), @@ -97,7 +96,7 @@ class ManySitesImportedLogs extends Fixture 'segmentPreArchivedWithUrlEncoding' => array('definition'=> self::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED, 'idSite' => 1, 'autoArchive' => true, - 'enabledAllUsers' => true) + 'enabledAllUsers' => true), // fails randomly and I really could not find why. // 'segmentOnlySuperuser' => array('definition' => 'actions>1;customVariablePageName1=='.urlencode('HTTP-code'), |