Skip to content

Commit a5349e0

Browse files
AltamashShaikhAltamashShaikh
authored
Merge pull request #110 from matomo-org/updateomnifixture
Update tests after fixture change
2 parents ffcd0c6 + f783ea7 commit a5349e0

8 files changed

Lines changed: 33 additions & 22 deletions

‎tests/System/TwoVisitsWithCustomVariablesTest.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,28 @@ public function getApiForTesting()
3232
$idSite = self::$fixture->idSite;
3333
$dateTime = self::$fixture->dateTime;
3434

35+
$xmlFieldsToRemove = [];
36+
37+
if (version_compare(Version::VERSION, '5.4.0-b4', '<')) {
38+
// the fixture used from core changed, so this metric might differ for older versions
39+
$xmlFieldsToRemove = ['sum_visit_length', 'avg_time_on_site'];
40+
}
41+
3542
$apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables');
3643

3744
$return = array(
3845
array($apiToCall, array('idSite' => 'all',
3946
'date' => $dateTime,
4047
'periods' => array('day', 'week'),
48+
'xmlFieldsToRemove' => $xmlFieldsToRemove,
4149
'setDateLastN' => true)),
4250

4351
// test w/ custom variable segments
4452
array('VisitsSummary.get', array(
4553
'idSite' => self::$fixture->idSite,
4654
'date' => self::$fixture->dateTime,
4755
'periods' => array('day'),
56+
'xmlFieldsToRemove' => $xmlFieldsToRemove,
4857
'testSuffix' => '_segmentCustomVarName',
4958
'segment' => 'customVariablePageName=@SET WITH',
5059
)),
@@ -53,6 +62,7 @@ public function getApiForTesting()
5362
'idSite' => self::$fixture->idSite,
5463
'date' => self::$fixture->dateTime,
5564
'periods' => array('day'),
65+
'xmlFieldsToRemove' => $xmlFieldsToRemove,
5666
'testSuffix' => '_segmentCustomVarValue',
5767
'segment' => 'customVariableValue=@LoggedIn',
5868
)),
@@ -61,6 +71,7 @@ public function getApiForTesting()
6171
'idSite' => self::$fixture->idSite,
6272
'date' => self::$fixture->dateTime,
6373
'periods' => array('day'),
74+
'xmlFieldsToRemove' => $xmlFieldsToRemove,
6475
'testSuffix' => '_segmentAll',
6576
'segment' => 'customVariableName=@Othercustom,customVariablePageValue=@abcdefghi',
6677
)),

‎tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<nb_actions>6</nb_actions>
99
<nb_users>0</nb_users>
1010
<max_actions>4</max_actions>
11-
<sum_visit_length>722</sum_visit_length>
11+
<sum_visit_length>725</sum_visit_length>
1212
<bounce_count>2</bounce_count>
1313
<nb_visits_converted>2</nb_visits_converted>
1414
<goals>
@@ -39,7 +39,7 @@
3939
<nb_actions>4</nb_actions>
4040
<nb_users>0</nb_users>
4141
<max_actions>4</max_actions>
42-
<sum_visit_length>361</sum_visit_length>
42+
<sum_visit_length>364</sum_visit_length>
4343
<bounce_count>0</bounce_count>
4444
<nb_visits_converted>1</nb_visits_converted>
4545
<goals>
@@ -84,7 +84,7 @@
8484
<nb_actions>4</nb_actions>
8585
<nb_users>0</nb_users>
8686
<max_actions>4</max_actions>
87-
<sum_visit_length>361</sum_visit_length>
87+
<sum_visit_length>364</sum_visit_length>
8888
<bounce_count>0</bounce_count>
8989
<nb_visits_converted>1</nb_visits_converted>
9090
<goals>
@@ -110,7 +110,7 @@
110110
<nb_actions>4</nb_actions>
111111
<nb_users>0</nb_users>
112112
<max_actions>4</max_actions>
113-
<sum_visit_length>361</sum_visit_length>
113+
<sum_visit_length>364</sum_visit_length>
114114
<bounce_count>0</bounce_count>
115115
<nb_visits_converted>1</nb_visits_converted>
116116
<goals>
@@ -131,7 +131,7 @@
131131
<nb_actions>4</nb_actions>
132132
<nb_users>0</nb_users>
133133
<max_actions>4</max_actions>
134-
<sum_visit_length>361</sum_visit_length>
134+
<sum_visit_length>364</sum_visit_length>
135135
<bounce_count>0</bounce_count>
136136
<nb_visits_converted>1</nb_visits_converted>
137137
<goals>
@@ -157,7 +157,7 @@
157157
<nb_actions>4</nb_actions>
158158
<nb_users>0</nb_users>
159159
<max_actions>4</max_actions>
160-
<sum_visit_length>361</sum_visit_length>
160+
<sum_visit_length>364</sum_visit_length>
161161
<bounce_count>0</bounce_count>
162162
<nb_visits_converted>1</nb_visits_converted>
163163
<goals>

‎tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<nb_visits>3</nb_visits>
88
<nb_actions>6</nb_actions>
99
<max_actions>4</max_actions>
10-
<sum_visit_length>722</sum_visit_length>
10+
<sum_visit_length>725</sum_visit_length>
1111
<bounce_count>2</bounce_count>
1212
<nb_visits_converted>2</nb_visits_converted>
1313
<goals>
@@ -39,7 +39,7 @@
3939
<nb_visits>1</nb_visits>
4040
<nb_actions>4</nb_actions>
4141
<max_actions>4</max_actions>
42-
<sum_visit_length>361</sum_visit_length>
42+
<sum_visit_length>364</sum_visit_length>
4343
<bounce_count>0</bounce_count>
4444
<nb_visits_converted>1</nb_visits_converted>
4545
<goals>
@@ -86,7 +86,7 @@
8686
<nb_visits>1</nb_visits>
8787
<nb_actions>4</nb_actions>
8888
<max_actions>4</max_actions>
89-
<sum_visit_length>361</sum_visit_length>
89+
<sum_visit_length>364</sum_visit_length>
9090
<bounce_count>0</bounce_count>
9191
<nb_visits_converted>1</nb_visits_converted>
9292
<goals>
@@ -113,7 +113,7 @@
113113
<nb_visits>1</nb_visits>
114114
<nb_actions>4</nb_actions>
115115
<max_actions>4</max_actions>
116-
<sum_visit_length>361</sum_visit_length>
116+
<sum_visit_length>364</sum_visit_length>
117117
<bounce_count>0</bounce_count>
118118
<nb_visits_converted>1</nb_visits_converted>
119119
<goals>
@@ -135,7 +135,7 @@
135135
<nb_visits>1</nb_visits>
136136
<nb_actions>4</nb_actions>
137137
<max_actions>4</max_actions>
138-
<sum_visit_length>361</sum_visit_length>
138+
<sum_visit_length>364</sum_visit_length>
139139
<bounce_count>0</bounce_count>
140140
<nb_visits_converted>1</nb_visits_converted>
141141
<goals>
@@ -162,7 +162,7 @@
162162
<nb_visits>1</nb_visits>
163163
<nb_actions>4</nb_actions>
164164
<max_actions>4</max_actions>
165-
<sum_visit_length>361</sum_visit_length>
165+
<sum_visit_length>364</sum_visit_length>
166166
<bounce_count>0</bounce_count>
167167
<nb_visits_converted>1</nb_visits_converted>
168168
<goals>

‎tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<nb_actions>6</nb_actions>
99
<nb_visits_converted>2</nb_visits_converted>
1010
<bounce_count>2</bounce_count>
11-
<sum_visit_length>722</sum_visit_length>
11+
<sum_visit_length>725</sum_visit_length>
1212
<max_actions>4</max_actions>
1313
<bounce_rate>67%</bounce_rate>
1414
<nb_actions_per_visit>2</nb_actions_per_visit>
15-
<avg_time_on_site>241</avg_time_on_site>
15+
<avg_time_on_site>242</avg_time_on_site>
1616
</result>
1717
<result date="2010-01-04" />
1818
<result date="2010-01-05" />

‎tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<nb_actions>6</nb_actions>
99
<nb_visits_converted>2</nb_visits_converted>
1010
<bounce_count>2</bounce_count>
11-
<sum_visit_length>722</sum_visit_length>
11+
<sum_visit_length>725</sum_visit_length>
1212
<max_actions>4</max_actions>
1313
<bounce_rate>67%</bounce_rate>
1414
<nb_actions_per_visit>2</nb_actions_per_visit>
15-
<avg_time_on_site>241</avg_time_on_site>
15+
<avg_time_on_site>242</avg_time_on_site>
1616
</result>
1717
<result date="2010-01-04,2010-01-10" />
1818
<result date="2010-01-11,2010-01-17" />

‎tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<nb_users>0</nb_users>
6767
<conversion_rate>100%</conversion_rate>
6868
<nb_actions_per_visit>4</nb_actions_per_visit>
69-
<avg_time_on_site>00:06:01</avg_time_on_site>
69+
<avg_time_on_site>00:06:04</avg_time_on_site>
7070
<bounce_rate>0%</bounce_rate>
7171
<nb_uniq_visitors>0</nb_uniq_visitors>
7272
</row>
@@ -88,7 +88,7 @@
8888
<nb_actions>24</nb_actions>
8989
<nb_users>0</nb_users>
9090
<max_actions>13</max_actions>
91-
<sum_visit_length>1805</sum_visit_length>
91+
<sum_visit_length>1814</sum_visit_length>
9292
<bounce_count>4</bounce_count>
9393
<nb_visits_converted>5</nb_visits_converted>
9494
<goals>

‎tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<nb_actions>4</nb_actions>
77
<nb_visits_converted>1</nb_visits_converted>
88
<bounce_count>0</bounce_count>
9-
<sum_visit_length>361</sum_visit_length>
9+
<sum_visit_length>364</sum_visit_length>
1010
<max_actions>4</max_actions>
1111
<bounce_rate>0%</bounce_rate>
1212
<nb_actions_per_visit>4</nb_actions_per_visit>
13-
<avg_time_on_site>361</avg_time_on_site>
13+
<avg_time_on_site>364</avg_time_on_site>
1414
</result>

‎tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<nb_actions>4</nb_actions>
77
<nb_visits_converted>1</nb_visits_converted>
88
<bounce_count>0</bounce_count>
9-
<sum_visit_length>361</sum_visit_length>
9+
<sum_visit_length>364</sum_visit_length>
1010
<max_actions>4</max_actions>
1111
<bounce_rate>0%</bounce_rate>
1212
<nb_actions_per_visit>4</nb_actions_per_visit>
13-
<avg_time_on_site>361</avg_time_on_site>
13+
<avg_time_on_site>364</avg_time_on_site>
1414
</result>

0 commit comments

Comments
 (0)