diff options
| author | Stefan Giehl <stefan@piwik.org> | 2017-11-20 00:52:23 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-11-20 00:52:23 +0300 |
| commit | 23249e9eec85350e7464eac3ec90450b2614e3c7 (patch) | |
| tree | 473a10c4216fb6d8e6ee1adb8f2b0df07aa527c1 /tests/PHPUnit | |
| parent | e6b5f3338b107b458d0b15b2468268cce34bf54d (diff) | |
Use composer version of GeoIP library (#12021)
* use composer version of geoip library
* region london was renamend in latest geoip version
Diffstat (limited to 'tests/PHPUnit')
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 bf269dec87..5b86c36a58 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, City of</region> + <region>London</region> <regionCode>H9</regionCode> <city>London</city> - <location>London, London, City of, United Kingdom</location> + <location>London, London, 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, City of</region> + <region>London</region> <regionCode>H9</regionCode> <city>London</city> - <location>London, London, City of, United Kingdom</location> + <location>London, London, 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 8cc2b0f386..7168e37470 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, City of, United Kingdom</label> + <label>London, London, 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, City of</region_name> + <region_name>London</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 9e358630a1..756200496c 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, City of, United Kingdom</label> + <label>London, 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, City of</region_name> + <region_name>London</region_name> <logo>plugins/Morpheus/icons/dist/flags/gb.png</logo> </row> <row> |