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:
authorThomas Steur <tsteur@users.noreply.github.com>2020-04-02 02:28:16 +0300
committerGitHub <noreply@github.com>2020-04-02 02:28:16 +0300
commit8c9c318fa1c74406b10b1a9d37041e64dd2a5b0e (patch)
treefed0510c46a2b64acec195afdef6018fa72048a4
parente89ebdf79d3ac7372663447d112bab38b0c17478 (diff)
Fix tests for tracker plugins no longer worked (#15737)
Regression from https://github.com/matomo-org/matomo/pull/15568 When running JS tests like https://foo.bar/tests/javascript/ then the tracker.js of tracking plugins was no longer included in the matomo.js
-rw-r--r--plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php17
1 files changed, 17 insertions, 0 deletions
diff --git a/plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php b/plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php
index 773ac03286..f89bc2e3be 100644
--- a/plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php
+++ b/plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php
@@ -19,6 +19,23 @@ class JsTestPluginTrackerFiles extends PluginTrackerFiles
$this->ignoreMinified = true;
}
+ protected function getDirectoriesToLook()
+ {
+ $dirs = array();
+ $trackerFiles = \_glob(PIWIK_DOCUMENT_ROOT . '/plugins/*/' . self::TRACKER_FILE);
+ foreach ($trackerFiles as $trackerFile) {
+ $pluginName = $this->getPluginNameFromFile($trackerFile);
+ $dirs[$pluginName] = dirname($trackerFile) . '/';
+ }
+ return $dirs;
+ }
+
+ protected function getPluginNameFromFile($file)
+ {
+ $file = str_replace(array(PIWIK_DOCUMENT_ROOT . '/plugins/', self::TRACKER_FILE), '', $file);
+ return trim($file, '/');
+ }
+
protected function isPluginActivated($pluginName)
{
return true;