Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2017-11-21 21:28:08 +0300
committerStefan Giehl <stefan@piwik.org>2017-11-22 23:24:52 +0300
commitbfc71ad6468737edf3c11093cb4d24735299f228 (patch)
tree045d8e47f77fd3426d18e78203c0643914c2b886 /tests/PHPUnit/System/expected
parentd6dea0a51d4dee03a2a324a8eebcb93880ca3213 (diff)
Revert "Use composer version of GeoIP library (#12021)"
This reverts commit 23249e9eec85350e7464eac3ec90450b2614e3c7.
Diffstat (limited to 'tests/PHPUnit/System/expected')
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml4
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 5b86c36a58..bf269dec87 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -2052,10 +2052,10 @@
<country>United Kingdom</country>
<countryCode>gb</countryCode>
<countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag>
- <region>London</region>
+ <region>London, City of</region>
<regionCode>H9</regionCode>
<city>London</city>
- <location>London, London, United Kingdom</location>
+ <location>London, London, City of, United Kingdom</location>
<latitude />
<longitude />
<visitLocalTime>12:34:06</visitLocalTime>
@@ -2384,10 +2384,10 @@
<country>United Kingdom</country>
<countryCode>gb</countryCode>
<countryFlag>plugins/Morpheus/icons/dist/flags/gb.png</countryFlag>
- <region>London</region>
+ <region>London, City of</region>
<regionCode>H9</regionCode>
<city>London</city>
- <location>London, London, United Kingdom</location>
+ <location>London, London, City of, United Kingdom</location>
<latitude />
<longitude />
<visitLocalTime>12:34:06</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 7168e37470..8cc2b0f386 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -195,7 +195,7 @@
<logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
</row>
<row>
- <label>London, London, United Kingdom</label>
+ <label>London, London, City of, United Kingdom</label>
<nb_visits>2</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>4</max_actions>
@@ -222,7 +222,7 @@
<region>H9</region>
<country>gb</country>
<country_name>United Kingdom</country_name>
- <region_name>London</region_name>
+ <region_name>London, City of</region_name>
<logo>plugins/Morpheus/icons/dist/flags/gb.png</logo>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index 756200496c..9e358630a1 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -180,7 +180,7 @@
<logo>plugins/Morpheus/icons/dist/flags/gb.png</logo>
</row>
<row>
- <label>London, United Kingdom</label>
+ <label>London, City of, United Kingdom</label>
<nb_visits>2</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>4</max_actions>
@@ -206,7 +206,7 @@
<region>H9</region>
<country>gb</country>
<country_name>United Kingdom</country_name>
- <region_name>London</region_name>
+ <region_name>London, City of</region_name>
<logo>plugins/Morpheus/icons/dist/flags/gb.png</logo>
</row>
<row>