diff --git a/tests/System/TrackSeveralCampaignsTest.php b/tests/System/TrackSeveralCampaignsTest.php index 4992dc3..42ea338 100644 --- a/tests/System/TrackSeveralCampaignsTest.php +++ b/tests/System/TrackSeveralCampaignsTest.php @@ -82,6 +82,12 @@ public function getApiForTesting() $dateTime = self::$fixture->dateTime; $phpVersionPrefix = version_compare(PHP_VERSION, 8.2, '<') && !self::$isMariaDB ? 'min_php_' : ''; + $xmlFieldsToRemove = []; + + if (version_compare(Version::VERSION, '5.5.0-b1', '<')) { + $xmlFieldsToRemove = ['Referrers_visitorsFromAIAssistants', 'Referrers_distinctAIAssistants', 'Referrers_visitorsFromAIAssistants_percent']; + } + $apiToTest[] = [ 'API.get', [ @@ -89,6 +95,7 @@ public function getApiForTesting() 'date' => $dateWithPluginEnabled, 'periods' => ['day'], 'testSuffix' => (!empty($phpVersionPrefix) ? $phpVersionPrefix : 'max_php_') . (version_compare(Version::VERSION, '5.2.0-b6', '<') ? 'old' : ''), + 'xmlFieldsToRemove' => $xmlFieldsToRemove, ] ]; @@ -96,7 +103,12 @@ public function getApiForTesting() if (version_compare(Version::VERSION, '5.2.0-alpha', '<')) { // In Matomo 5.2 referrer columns had been added to ecommerce actions. For tests with older Matomo releases we therefor ignore those columns - $columnsToHide = ['referrerType', 'referrerName', 'referrerKeyword']; + $columnsToHide = array_merge($columnsToHide, ['referrerType', 'referrerName', 'referrerKeyword']); + } + + if (version_compare(Version::VERSION, '5.5.0-b1', '<')) { + // In Matomo 5.5 ai referrer had been added + $columnsToHide = array_merge($columnsToHide, ['referrerAIAssistantUrl', 'referrerAIAssistantIcon']); } $apiToTest[] = [ diff --git a/tests/System/expected/test___Live.getLastVisitsDetails_day.xml b/tests/System/expected/test___Live.getLastVisitsDetails_day.xml index 0d7a6ca..1bdf956 100644 --- a/tests/System/expected/test___Live.getLastVisitsDetails_day.xml +++ b/tests/System/expected/test___Live.getLastVisitsDetails_day.xml @@ -100,6 +100,8 @@ + + fr French Desktop @@ -262,6 +264,8 @@ + + fr French Desktop @@ -451,6 +455,8 @@ + + fr French Desktop @@ -586,6 +592,8 @@ + + fr French Desktop @@ -721,6 +729,8 @@ + + fr French Desktop @@ -856,6 +866,8 @@ + + fr French Desktop @@ -991,6 +1003,8 @@ + + fr French Desktop @@ -1126,6 +1140,8 @@ + + fr French Desktop @@ -1261,6 +1277,8 @@ + + fr French Desktop @@ -1396,6 +1414,8 @@ + + fr French Desktop diff --git a/tests/System/expected/test_max_php___API.get_day.xml b/tests/System/expected/test_max_php___API.get_day.xml index d27cbbd..de7b665 100644 --- a/tests/System/expected/test_max_php___API.get_day.xml +++ b/tests/System/expected/test_max_php___API.get_day.xml @@ -25,11 +25,13 @@ 128 0 0 + 0 0 0 18 0 0 + 0 0 0 0 @@ -81,6 +83,7 @@ 18 0% 0% + 0% 100% 0% 0% diff --git a/tests/System/expected/test_min_php___API.get_day.xml b/tests/System/expected/test_min_php___API.get_day.xml index 80a1a01..c267988 100644 --- a/tests/System/expected/test_min_php___API.get_day.xml +++ b/tests/System/expected/test_min_php___API.get_day.xml @@ -25,11 +25,13 @@ 128 0 0 + 0 0 0 18 0 0 + 0 0 0 0 @@ -81,10 +83,11 @@ 18 0% 0% + 0% 100% 0% 0% 100% 1 121 - + \ No newline at end of file diff --git a/tests/System/expected/test_min_php___Live.getLastVisitsDetails_day.xml b/tests/System/expected/test_min_php___Live.getLastVisitsDetails_day.xml index a752a77..2188b90 100644 --- a/tests/System/expected/test_min_php___Live.getLastVisitsDetails_day.xml +++ b/tests/System/expected/test_min_php___Live.getLastVisitsDetails_day.xml @@ -100,6 +100,8 @@ + + fr French Desktop @@ -262,6 +264,8 @@ + + fr French Desktop @@ -451,6 +455,8 @@ + + fr French Desktop @@ -586,6 +592,8 @@ + + fr French Desktop @@ -721,6 +729,8 @@ + + fr French Desktop @@ -856,6 +866,8 @@ + + fr French Desktop @@ -991,6 +1003,8 @@ + + fr French Desktop @@ -1126,6 +1140,8 @@ + + fr French Desktop @@ -1261,6 +1277,8 @@ + + fr French Desktop @@ -1396,6 +1414,8 @@ + + fr French Desktop diff --git a/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_ecommerce.png b/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_ecommerce.png index a04fb98..66ca616 100644 Binary files a/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_ecommerce.png and b/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_ecommerce.png differ diff --git a/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_goals.png b/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_goals.png index 6653621..1959906 100644 Binary files a/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_goals.png and b/tests/UI/expected-ui-screenshots/MarketingCampaignsReporting_ReportsByDimensionAddition_loaded_goals.png differ