Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/System/AutoSuggestAPITest.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ public function getApiForTesting()

$xmlFieldsToRemove = ['latitude', 'longitude'];

if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
// In Matomo 5.5 ai referrer had been added
$xmlFieldsToRemove = array_merge($xmlFieldsToRemove, ['referrerAIAssistantUrl', 'referrerAIAssistantIcon']);
}

$apiForTesting[] = [
'Live.getLastVisitsDetails',
[
Expand Down
5 changes: 5 additions & 0 deletions tests/System/CustomVariablesSystemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public function getApiForTesting()
];
}

if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
// In Matomo 5.5 ai referrer had been added
$xmlFieldsToRemove = array_merge($xmlFieldsToRemove, ['referrerAIAssistantUrl', 'referrerAIAssistantIcon']);
}

return [
[
$apiToCall,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function getApiForTesting()
*/
public function testCheck()
{
if (version_compare(Version::VERSION, '5.4.0-b3', '<')) {
if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
self::markTestSkipped('archive numbers have changed');
}

Expand All @@ -97,25 +97,25 @@ public function testCheck()
// 1) CHECK 'day' archive stored in January
// We expect 2 segments
// * (1 custom variable name + 2 ref metrics
// + 1 subtable chunk for the custom var values + 6 Referrers blob (2 of them subtables)
// + 1 subtable chunk for the custom var values + 7 Referrers blob (2 of them subtables)
// )
'archive_blob_2010_01' => 20,
'archive_blob_2010_01' => 22,
// This contains all 'last N' weeks & days,
// (8 metrics
// + 6 referrer metrics
// + 7 referrer metrics
// + 3 done flag )
// * 2 segments
// for each "Last N" date that has data (just one date)
'archive_numeric_2010_01' => 34,
'archive_numeric_2010_01' => 36,

// 2) CHECK 'week' archive stored in December (week starts the month before)
// We expect 2 segments * (2 custom variable name + 2 ref metrics + 1 subtable chunk for the values of the name + 6 referrers blob (2 of them subtables))
'archive_blob_2009_12' => 20,
// We expect 2 segments * (2 custom variable name + 2 ref metrics + 1 subtable chunk for the values of the name + 7 referrers blob (2 of them subtables))
'archive_blob_2009_12' => 22,
// 8 metrics,
// 6 Referrer metrics,
// 7 Referrer metrics,
// 3 done flag (referrers, CustomVar, VisitsSummary), all for period = 2, day w/ visits is in new year, other days have no data
// X * 2 segments
'archive_numeric_2009_12' => (8 + 6 + 3) * 2,
'archive_numeric_2009_12' => (8 + 7 + 3) * 2,
);

foreach ($tests as $table => $expectedRows) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -316,6 +318,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -473,6 +477,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -692,6 +698,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -858,6 +866,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -1128,6 +1138,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -1285,6 +1297,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -1504,6 +1518,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -1661,6 +1677,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -1899,6 +1917,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -2065,6 +2085,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -2316,6 +2338,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Tablet</deviceType>
Expand Down Expand Up @@ -2559,6 +2583,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -2716,6 +2742,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Tablet</deviceType>
Expand Down Expand Up @@ -2873,6 +2901,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -3111,6 +3141,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -3341,6 +3373,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -3498,6 +3532,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -3655,6 +3691,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -3874,6 +3912,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -4093,6 +4133,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -4304,6 +4346,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Smartphone</deviceType>
Expand Down Expand Up @@ -4523,6 +4567,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -4689,6 +4735,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -4855,6 +4903,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -5021,6 +5071,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Smartphone</deviceType>
Expand Down Expand Up @@ -5187,6 +5239,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -5457,6 +5511,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Phablet</deviceType>
Expand Down Expand Up @@ -5727,6 +5783,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode />
<language>Unknown</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -5989,6 +6047,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Smartphone</deviceType>
Expand Down Expand Up @@ -6259,6 +6319,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -6416,6 +6478,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Phablet</deviceType>
Expand Down Expand Up @@ -6573,6 +6637,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -6730,6 +6796,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Smartphone</deviceType>
Expand Down Expand Up @@ -6887,6 +6955,8 @@
<referrerSearchEngineIcon />
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
<referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon>
<referrerSocialNetworkUrl />
<referrerSocialNetworkIcon />
<referrerAIAssistantUrl />
<referrerAIAssistantIcon />
<languageCode>fr</languageCode>
<language>French</language>
<deviceType>Desktop</deviceType>
Expand Down