Skip to content

Update tests after fixture change #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AltamashShaikh merged 2 commits into from
Aug 5, 2025
Merged

Update tests after fixture change #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de48b8f
Update tests after fixture change
sgiehl Aug 4, 2025
f783ea7
also ignore avg_time_on_site
sgiehl Aug 5, 2025
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
11 changes: 11 additions & 0 deletions tests/System/TwoVisitsWithCustomVariablesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,28 @@ 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', 'avg_time_on_site'];
}

$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
array('VisitsSummary.get', array(
'idSite' => self::$fixture->idSite,
'date' => self::$fixture->dateTime,
'periods' => array('day'),
'xmlFieldsToRemove' => $xmlFieldsToRemove,
'testSuffix' => '_segmentCustomVarName',
'segment' => 'customVariablePageName=@SET WITH',
)),
Expand All @@ -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',
)),
Expand All @@ -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',
)),
Expand Down
12 changes: 6 additions & 6 deletions ...em/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<nb_actions>6</nb_actions>
<nb_users>0</nb_users>
<max_actions>4</max_actions>
<sum_visit_length>722</sum_visit_length>
<sum_visit_length>725</sum_visit_length>
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<goals>
Expand Down Expand Up @@ -39,7 +39,7 @@
<nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand Down Expand Up @@ -84,7 +84,7 @@
<nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand All @@ -110,7 +110,7 @@
<nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand All @@ -131,7 +131,7 @@
<nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand All @@ -157,7 +157,7 @@
<nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand Down
12 changes: 6 additions & 6 deletions ...m/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<nb_visits>3</nb_visits>
<nb_actions>6</nb_actions>
<max_actions>4</max_actions>
<sum_visit_length>722</sum_visit_length>
<sum_visit_length>725</sum_visit_length>
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<goals>
Expand Down Expand Up @@ -39,7 +39,7 @@
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand Down Expand Up @@ -86,7 +86,7 @@
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand All @@ -113,7 +113,7 @@
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand All @@ -135,7 +135,7 @@
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand All @@ -162,7 +162,7 @@
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
<max_actions>4</max_actions>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<nb_actions>6</nb_actions>
<nb_visits_converted>2</nb_visits_converted>
<bounce_count>2</bounce_count>
<sum_visit_length>722</sum_visit_length>
<sum_visit_length>725</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
<avg_time_on_site>241</avg_time_on_site>
<avg_time_on_site>242</avg_time_on_site>
</result>
<result date="2010-01-04" />
<result date="2010-01-05" />
Expand Down
4 changes: 2 additions & 2 deletions tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<nb_actions>6</nb_actions>
<nb_visits_converted>2</nb_visits_converted>
<bounce_count>2</bounce_count>
<sum_visit_length>722</sum_visit_length>
<sum_visit_length>725</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
<avg_time_on_site>241</avg_time_on_site>
<avg_time_on_site>242</avg_time_on_site>
</result>
<result date="2010-01-04,2010-01-10" />
<result date="2010-01-11,2010-01-17" />
Expand Down
4 changes: 2 additions & 2 deletions ...stem/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<nb_users>0</nb_users>
<conversion_rate>100%</conversion_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
<avg_time_on_site>00:06:01</avg_time_on_site>
<avg_time_on_site>00:06:04</avg_time_on_site>
<bounce_rate>0%</bounce_rate>
<nb_uniq_visitors>0</nb_uniq_visitors>
</row>
Expand All @@ -88,7 +88,7 @@
<nb_actions>24</nb_actions>
<nb_users>0</nb_users>
<max_actions>13</max_actions>
<sum_visit_length>1805</sum_visit_length>
<sum_visit_length>1814</sum_visit_length>
<bounce_count>4</bounce_count>
<nb_visits_converted>5</nb_visits_converted>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions ...xpected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<nb_actions>4</nb_actions>
<nb_visits_converted>1</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
<avg_time_on_site>361</avg_time_on_site>
<avg_time_on_site>364</avg_time_on_site>
</result>
4 changes: 2 additions & 2 deletions ...pected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<nb_actions>4</nb_actions>
<nb_visits_converted>1</nb_visits_converted>
<bounce_count>0</bounce_count>
<sum_visit_length>361</sum_visit_length>
<sum_visit_length>364</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
<avg_time_on_site>361</avg_time_on_site>
<avg_time_on_site>364</avg_time_on_site>
</result>