From de48b8f8f95d211636b74e1720265adb4c56ace7 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 4 Aug 2025 16:49:51 +0200 Subject: [PATCH 1/2] Update tests after fixture change --- tests/System/TwoVisitsWithCustomVariablesTest.php | 11 +++++++++++ ...ables__CustomVariables.getCustomVariables_day.xml | 12 ++++++------ ...bles__CustomVariables.getCustomVariables_week.xml | 12 ++++++------ ...itsWithCustomVariables__VisitsSummary.get_day.xml | 4 ++-- ...tsWithCustomVariables__VisitsSummary.get_week.xml | 4 ++-- ...riables__subtable__API.getProcessedReport_day.xml | 4 ++-- ...s_segmentCustomVarName__VisitsSummary.get_day.xml | 4 ++-- ..._segmentCustomVarValue__VisitsSummary.get_day.xml | 4 ++-- 8 files changed, 33 insertions(+), 22 deletions(-) diff --git a/tests/System/TwoVisitsWithCustomVariablesTest.php b/tests/System/TwoVisitsWithCustomVariablesTest.php index bd9ab2a..3e90228 100644 --- a/tests/System/TwoVisitsWithCustomVariablesTest.php +++ b/tests/System/TwoVisitsWithCustomVariablesTest.php @@ -32,12 +32,20 @@ public function getApiForTesting() $idSite = self::$fixture->idSite; $dateTime = self::$fixture->dateTime; + $xmlFieldsToRemove = []; + + if (version_compare(Version::VERSION, '5.4.0-b4', '<')) { + // the fixture used from core changed, so this metric might differ for older versions + $xmlFieldsToRemove = ['sum_visit_length']; + } + $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables'); $return = array( array($apiToCall, array('idSite' => 'all', 'date' => $dateTime, 'periods' => array('day', 'week'), + 'xmlFieldsToRemove' => $xmlFieldsToRemove, 'setDateLastN' => true)), // test w/ custom variable segments @@ -45,6 +53,7 @@ public function getApiForTesting() 'idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => array('day'), + 'xmlFieldsToRemove' => $xmlFieldsToRemove, 'testSuffix' => '_segmentCustomVarName', 'segment' => 'customVariablePageName=@SET WITH', )), @@ -53,6 +62,7 @@ public function getApiForTesting() 'idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => array('day'), + 'xmlFieldsToRemove' => $xmlFieldsToRemove, 'testSuffix' => '_segmentCustomVarValue', 'segment' => 'customVariableValue=@LoggedIn', )), @@ -61,6 +71,7 @@ public function getApiForTesting() 'idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, 'periods' => array('day'), + 'xmlFieldsToRemove' => $xmlFieldsToRemove, 'testSuffix' => '_segmentAll', 'segment' => 'customVariableName=@Othercustom,customVariablePageValue=@abcdefghi', )), diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml index ebe6828..aedbc63 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml @@ -8,7 +8,7 @@ 6 0 4 - 722 + 725 2 2 @@ -39,7 +39,7 @@ 4 0 4 - 361 + 364 0 1 @@ -84,7 +84,7 @@ 4 0 4 - 361 + 364 0 1 @@ -110,7 +110,7 @@ 4 0 4 - 361 + 364 0 1 @@ -131,7 +131,7 @@ 4 0 4 - 361 + 364 0 1 @@ -157,7 +157,7 @@ 4 0 4 - 361 + 364 0 1 diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml index cc5f787..c3e5861 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml @@ -7,7 +7,7 @@ 3 6 4 - 722 + 725 2 2 @@ -39,7 +39,7 @@ 1 4 4 - 361 + 364 0 1 @@ -86,7 +86,7 @@ 1 4 4 - 361 + 364 0 1 @@ -113,7 +113,7 @@ 1 4 4 - 361 + 364 0 1 @@ -135,7 +135,7 @@ 1 4 4 - 361 + 364 0 1 @@ -162,7 +162,7 @@ 1 4 4 - 361 + 364 0 1 diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml index ab7f9f9..53cf1ad 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml @@ -8,11 +8,11 @@ 6 2 2 - 722 + 725 4 67% 2 - 241 + 242 diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml index cf97edb..82ba451 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml @@ -8,11 +8,11 @@ 6 2 2 - 722 + 725 4 67% 2 - 241 + 242 diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index bb01944..83e7daa 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -66,7 +66,7 @@ 0 100% 4 - 00:06:01 + 00:06:04 0% 0 @@ -88,7 +88,7 @@ 24 0 13 - 1805 + 1814 4 5 diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml index 15cb2d0..61834da 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml @@ -6,9 +6,9 @@ 4 1 0 - 361 + 364 4 0% 4 - 361 + 364 \ No newline at end of file diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml index 15cb2d0..61834da 100644 --- a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml +++ b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml @@ -6,9 +6,9 @@ 4 1 0 - 361 + 364 4 0% 4 - 361 + 364 \ No newline at end of file From f783ea763363f68c01c7b5d13e02743d68d6e816 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 5 Aug 2025 18:40:04 +0200 Subject: [PATCH 2/2] also ignore avg_time_on_site --- tests/System/TwoVisitsWithCustomVariablesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/System/TwoVisitsWithCustomVariablesTest.php b/tests/System/TwoVisitsWithCustomVariablesTest.php index 3e90228..60b43c5 100644 --- a/tests/System/TwoVisitsWithCustomVariablesTest.php +++ b/tests/System/TwoVisitsWithCustomVariablesTest.php @@ -36,7 +36,7 @@ public function getApiForTesting() if (version_compare(Version::VERSION, '5.4.0-b4', '<')) { // the fixture used from core changed, so this metric might differ for older versions - $xmlFieldsToRemove = ['sum_visit_length']; + $xmlFieldsToRemove = ['sum_visit_length', 'avg_time_on_site']; } $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables');