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:
authorStefan Giehl <stefan@matomo.org>2019-08-15 21:16:34 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-08-15 21:16:34 +0300
commit0da695c3b557d4eaa74fe224f0f5565332d3d702 (patch)
tree7e0bbb788387a7dee82cdbd19f47e6a339a4f972 /plugins/CoreConsole
parent9b15cdb0e07bb10768c9cc92e0d70dee683ac752 (diff)
Fix city archiving for cities without regions (#14731)
* Fix city archiving for cities without regions * Add city without region * Regenerate mmdb files * update exprected test files
Diffstat (limited to 'plugins/CoreConsole')
-rw-r--r--plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml
index 338f63ef02..c336d953d6 100644
--- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml
@@ -1269,8 +1269,8 @@
<countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
<region />
<regionCode />
- <city />
- <location>Singapore</location>
+ <city>Singapore</city>
+ <location>Singapore, Singapore</location>
<visitLocalTime>08:10:39</visitLocalTime>
<visitLocalHour>8</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml
index c37fa9d43f..db3d976568 100644
--- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml
@@ -490,8 +490,8 @@
<countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
<region />
<regionCode />
- <city />
- <location>Singapore</location>
+ <city>Singapore</city>
+ <location>Singapore, Singapore</location>
<visitLocalTime>08:10:38</visitLocalTime>
<visitLocalHour>8</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>