From fc9fe59626ab0f7d77351d9b2e502038ce058bdb Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 18 Feb 2013 02:43:38 +1300
Subject: [PATCH] Fixing bug on Jenkins
http://qa.piwik.org:8080/job/Piwik.CI/562/console
---
.../ManyVisitorsOneWebsiteTest.php | 2 +-
...eTest__Live.getLastVisitsDetails_month.xml | 168 +++++++++---------
...WebsiteTest__UserCountry.getCity_month.xml | 18 +-
...teTest__UserCountry.getContinent_month.xml | 19 --
...siteTest__UserCountry.getCountry_month.xml | 22 ---
...try.getNumberOfDistinctCountries_month.xml | 2 +-
...bsiteTest__UserCountry.getRegion_month.xml | 18 +-
7 files changed, 104 insertions(+), 145 deletions(-)
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
index 565f64ce20..909fa045d3 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
@@ -41,7 +41,7 @@ class Test_Piwik_Integration_ManyVisitorsOneWebsiteTest extends IntegrationTestC
self::downloadGeoIpDbs();
self::setMockLocationProvider();
- self::trackVisits(9, false);
+ self::trackVisits(8, false);
self::setLocationProvider('GeoIPCity.dat');
self::trackVisits(2, true, $useLocal = false);
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index b3648771e2..5485336820 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<idSite>1</idSite>
- <idVisit>35</idVisit>
+ <idVisit>33</idVisit>
<visitIp>194.57.91.215</visitIp>
<visitorType>new</visitorType>
@@ -18,7 +18,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>35</goalPageId>
+ <goalPageId>33</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>themes/default/images/goal.png</icon>
@@ -28,7 +28,7 @@
<url>http://piwik.net/grue/lair</url>
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>35</pageId>
+ <pageId>33</pageId>
<icon />
</row>
@@ -98,8 +98,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>18</idVisit>
- <visitIp>1.2.4.8</visitIp>
+ <idVisit>16</idVisit>
+ <visitIp>1.2.4.7</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -114,7 +114,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>18</goalPageId>
+ <goalPageId>16</goalPageId>
<url>http://piwik.net/space/quest/iv</url>
<icon>themes/default/images/goal.png</icon>
@@ -124,7 +124,7 @@
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>18</pageId>
+ <pageId>16</pageId>
<icon />
</row>
@@ -145,14 +145,14 @@
<daysSinceLastVisit>0</daysSinceLastVisit>
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <continent>Unknown</continent>
- <continentCode>unk</continentCode>
- <country>Unknown</country>
- <countryCode>xx</countryCode>
- <countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
- <region />
- <city />
- <location>Unknown</location>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>Macedonia, the Former Yugoslav Republic of</country>
+ <countryCode>mk</countryCode>
+ <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+ <region>Miravci</region>
+ <city>Stratford-upon-Avon</city>
+ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -194,8 +194,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>17</idVisit>
- <visitIp>1.2.4.8</visitIp>
+ <idVisit>15</idVisit>
+ <visitIp>1.2.4.7</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -210,7 +210,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>17</goalPageId>
+ <goalPageId>15</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>themes/default/images/goal.png</icon>
@@ -220,7 +220,7 @@
<url>http://piwik.net/grue/lair</url>
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>17</pageId>
+ <pageId>15</pageId>
<icon />
</row>
@@ -241,14 +241,14 @@
<daysSinceLastVisit>0</daysSinceLastVisit>
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <continent>Unknown</continent>
- <continentCode>unk</continentCode>
- <country>Unknown</country>
- <countryCode>xx</countryCode>
- <countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
- <region />
- <city />
- <location>Unknown</location>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>Macedonia, the Former Yugoslav Republic of</country>
+ <countryCode>mk</countryCode>
+ <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+ <region>Miravci</region>
+ <city>Stratford-upon-Avon</city>
+ <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -290,8 +290,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>16</idVisit>
- <visitIp>1.2.4.7</visitIp>
+ <idVisit>14</idVisit>
+ <visitIp>1.2.4.6</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -306,7 +306,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>16</goalPageId>
+ <goalPageId>14</goalPageId>
<url>http://piwik.net/space/quest/iv</url>
<icon>themes/default/images/goal.png</icon>
@@ -316,7 +316,7 @@
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>16</pageId>
+ <pageId>14</pageId>
<icon />
</row>
@@ -339,12 +339,12 @@
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Europe</continent>
<continentCode>eur</continentCode>
- <country>Macedonia, the Former Yugoslav Republic of</country>
- <countryCode>mk</countryCode>
- <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
- <region>Miravci</region>
- <city>Stratford-upon-Avon</city>
- <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+ <country>Russian Federation</country>
+ <countryCode>ru</countryCode>
+ <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+ <region>Saint Petersburg City</region>
+ <city>Hluboká nad Vltavou</city>
+ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -386,8 +386,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>15</idVisit>
- <visitIp>1.2.4.7</visitIp>
+ <idVisit>13</idVisit>
+ <visitIp>1.2.4.6</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -402,7 +402,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>15</goalPageId>
+ <goalPageId>13</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>themes/default/images/goal.png</icon>
@@ -412,7 +412,7 @@
<url>http://piwik.net/grue/lair</url>
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>15</pageId>
+ <pageId>13</pageId>
<icon />
</row>
@@ -435,12 +435,12 @@
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Europe</continent>
<continentCode>eur</continentCode>
- <country>Macedonia, the Former Yugoslav Republic of</country>
- <countryCode>mk</countryCode>
- <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
- <region>Miravci</region>
- <city>Stratford-upon-Avon</city>
- <location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+ <country>Russian Federation</country>
+ <countryCode>ru</countryCode>
+ <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+ <region>Saint Petersburg City</region>
+ <city>Hluboká nad Vltavou</city>
+ <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -482,8 +482,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>14</idVisit>
- <visitIp>1.2.4.6</visitIp>
+ <idVisit>12</idVisit>
+ <visitIp>1.2.4.5</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -498,7 +498,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>14</goalPageId>
+ <goalPageId>12</goalPageId>
<url>http://piwik.net/space/quest/iv</url>
<icon>themes/default/images/goal.png</icon>
@@ -508,7 +508,7 @@
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>14</pageId>
+ <pageId>12</pageId>
<icon />
</row>
@@ -535,8 +535,8 @@
<countryCode>ru</countryCode>
<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
<region>Saint Petersburg City</region>
- <city>Hluboká nad Vltavou</city>
- <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+ <city>Stratford-upon-Avon</city>
+ <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -578,8 +578,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>13</idVisit>
- <visitIp>1.2.4.6</visitIp>
+ <idVisit>11</idVisit>
+ <visitIp>1.2.4.5</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -594,7 +594,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>13</goalPageId>
+ <goalPageId>11</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>themes/default/images/goal.png</icon>
@@ -604,7 +604,7 @@
<url>http://piwik.net/grue/lair</url>
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>13</pageId>
+ <pageId>11</pageId>
<icon />
</row>
@@ -631,8 +631,8 @@
<countryCode>ru</countryCode>
<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
<region>Saint Petersburg City</region>
- <city>Hluboká nad Vltavou</city>
- <location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
+ <city>Stratford-upon-Avon</city>
+ <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -674,8 +674,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>12</idVisit>
- <visitIp>1.2.4.5</visitIp>
+ <idVisit>10</idVisit>
+ <visitIp>1.2.4.4</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -690,7 +690,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>12</goalPageId>
+ <goalPageId>10</goalPageId>
<url>http://piwik.net/space/quest/iv</url>
<icon>themes/default/images/goal.png</icon>
@@ -700,7 +700,7 @@
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>12</pageId>
+ <pageId>10</pageId>
<icon />
</row>
@@ -723,12 +723,12 @@
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Europe</continent>
<continentCode>eur</continentCode>
- <country>Russian Federation</country>
- <countryCode>ru</countryCode>
- <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
- <region>Saint Petersburg City</region>
+ <country>United Kingdom</country>
+ <countryCode>gb</countryCode>
+ <countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
+ <region>Kent</region>
<city>Stratford-upon-Avon</city>
- <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+ <location>Stratford-upon-Avon, Kent, United Kingdom</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -770,8 +770,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>11</idVisit>
- <visitIp>1.2.4.5</visitIp>
+ <idVisit>9</idVisit>
+ <visitIp>1.2.4.4</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -786,7 +786,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>11</goalPageId>
+ <goalPageId>9</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>themes/default/images/goal.png</icon>
@@ -796,7 +796,7 @@
<url>http://piwik.net/grue/lair</url>
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>11</pageId>
+ <pageId>9</pageId>
<icon />
</row>
@@ -819,12 +819,12 @@
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Europe</continent>
<continentCode>eur</continentCode>
- <country>Russian Federation</country>
- <countryCode>ru</countryCode>
- <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
- <region>Saint Petersburg City</region>
+ <country>United Kingdom</country>
+ <countryCode>gb</countryCode>
+ <countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
+ <region>Kent</region>
<city>Stratford-upon-Avon</city>
- <location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+ <location>Stratford-upon-Avon, Kent, United Kingdom</location>
<latitude />
<longitude />
<provider>Unknown</provider>
@@ -866,8 +866,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>10</idVisit>
- <visitIp>1.2.4.4</visitIp>
+ <idVisit>8</idVisit>
+ <visitIp>1.2.4.3</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
@@ -882,7 +882,7 @@
<type>goal</type>
<goalName>all</goalName>
<revenue>5</revenue>
- <goalPageId>10</goalPageId>
+ <goalPageId>8</goalPageId>
<url>http://piwik.net/space/quest/iv</url>
<icon>themes/default/images/goal.png</icon>
@@ -892,7 +892,7 @@
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>10</pageId>
+ <pageId>8</pageId>
<icon />
</row>
@@ -918,9 +918,9 @@
<country>United Kingdom</country>
<countryCode>gb</countryCode>
<countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
- <region>Kent</region>
- <city>Stratford-upon-Avon</city>
- <location>Stratford-upon-Avon, Kent, United Kingdom</location>
+ <region>London, City of</region>
+ <city>London</city>
+ <location>London, London, City of, United Kingdom</location>
<latitude />
<longitude />
<provider>Unknown</provider>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index d7b3cb512e..e986ef103e 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>8</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>8</bounce_count>
+ <bounce_count>6</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>8</nb_conversions>
- <nb_visits_converted>8</nb_visits_converted>
- <revenue>40</revenue>
+ <nb_conversions>6</nb_conversions>
+ <nb_visits_converted>6</nb_visits_converted>
+ <revenue>30</revenue>
</row>
</goals>
- <nb_conversions>8</nb_conversions>
- <revenue>40</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>6</nb_conversions>
+ <revenue>30</revenue>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<city_name>Unknown</city_name>
<city>xx</city>
<region>xx</region>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
index e482330f9a..a5036c0df5 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
@@ -57,23 +57,4 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<code>Asia</code>
</row>
- <row>
- <label>Unknown</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>2</nb_conversions>
- <nb_visits_converted>2</nb_visits_converted>
- <revenue>10</revenue>
- </row>
- </goals>
- <nb_conversions>2</nb_conversions>
- <revenue>10</revenue>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <code>Unknown</code>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index 4f0f39467e..e21ac0bdd7 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -176,28 +176,6 @@
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
</row>
- <row>
- <label>Unknown</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>2</nb_conversions>
- <nb_visits_converted>2</nb_visits_converted>
- <revenue>10</revenue>
- </row>
- </goals>
- <nb_conversions>2</nb_conversions>
- <revenue>10</revenue>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <code>xx</code>
- <logo>plugins/UserCountry/flags/xx.png</logo>
- <logoWidth>16</logoWidth>
- <logoHeight>11</logoHeight>
- </row>
<row>
<label>United States</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
index 5fec83d011..39535fab28 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>10</result>
\ No newline at end of file
+<result>9</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index fec20a6dff..31a1aa38b6 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>8</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>8</bounce_count>
+ <bounce_count>6</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>8</nb_conversions>
- <nb_visits_converted>8</nb_visits_converted>
- <revenue>40</revenue>
+ <nb_conversions>6</nb_conversions>
+ <nb_visits_converted>6</nb_visits_converted>
+ <revenue>30</revenue>
</row>
</goals>
- <nb_conversions>8</nb_conversions>
- <revenue>40</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>6</nb_conversions>
+ <revenue>30</revenue>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<region>xx</region>
<country>xx</country>
<country_name>Unknown</country_name>
--
GitLab