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
path: root/tests
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-09-13 00:20:38 +0300
committerGitHub <noreply@github.com>2017-09-13 00:20:38 +0300
commit3cb7169cef259efe922912364c3c8479a986619c (patch)
treed8d7c6c566a2f0c0288036ed61e0fd4272b615f6 /tests
parent571d96e9005518e408e2ad92ef5f2b6123b5632e (diff)
Show Tibet as part of China on map (#11930)
* Revert "free tibet!" This reverts commit 4e47c8aba3bf146292f6e9d38aa0151c383e6c33. * Remove unneeded translations * adjust API * fix tests * update screenshots * update tests files * update screenshot * Do not change detected location * update tests * Fix continent detection for old records * submodule update * update screenshots * Cleanup * use group by filters only if needed * make filter work for datatable maps
Diffstat (limited to 'tests')
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml24
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml56
-rw-r--r--tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml14
-rw-r--r--tests/UI/expected-screenshots/DashboardManager_create_new.png4
-rw-r--r--tests/UI/expected-screenshots/Dashboard_reset.png4
-rw-r--r--tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png4
-rw-r--r--tests/UI/expected-screenshots/EvolutionGraph_initial.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png4
15 files changed, 74 insertions, 74 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 982d316f0c..27cd927334 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -2245,13 +2245,13 @@
<events>1</events>
<continent>Asia</continent>
<continentCode>asi</continentCode>
- <country>Tibet</country>
- <countryCode>ti</countryCode>
- <countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag>
- <region>Unknown</region>
- <regionCode>1</regionCode>
+ <country>China</country>
+ <countryCode>cn</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/cn.png</countryFlag>
+ <region>Xizang</region>
+ <regionCode>14</regionCode>
<city>Lhasa</city>
- <location>Lhasa, Unknown, Tibet</location>
+ <location>Lhasa, Xizang, China</location>
<latitude>29.650000</latitude>
<longitude>91.100000</longitude>
<visitLocalTime>12:34:06</visitLocalTime>
@@ -2525,13 +2525,13 @@
<events>0</events>
<continent>Asia</continent>
<continentCode>asi</continentCode>
- <country>Tibet</country>
- <countryCode>ti</countryCode>
- <countryFlag>plugins/Morpheus/icons/dist/flags/ti.png</countryFlag>
- <region>Unknown</region>
- <regionCode>1</regionCode>
+ <country>China</country>
+ <countryCode>cn</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/cn.png</countryFlag>
+ <region>Xizang</region>
+ <regionCode>14</regionCode>
<city>Lhasa</city>
- <location>Lhasa, Unknown, Tibet</location>
+ <location>Lhasa, Xizang, China</location>
<latitude>29.650000</latitude>
<longitude>91.100000</longitude>
<visitLocalTime>12:34:06</visitLocalTime>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
index 84baa921c6..57ad401634 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
@@ -7,7 +7,7 @@
<row>it</row>
<row>fr</row>
<row>id</row>
- <row>ti</row>
+ <row>cn</row>
<row>mk</row>
<row>xx</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
index 68a8855109..9e28c098ed 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
@@ -5,7 +5,7 @@
<row>P3</row>
<row>A6</row>
<row>H9</row>
- <row>1</row>
+ <row>14</row>
<row>G5</row>
<row>CA</row>
</result> \ No newline at end of file
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 7df3efc479..8cc2b0f386 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -162,7 +162,7 @@
<logo>plugins/Morpheus/icons/dist/flags/ru.png</logo>
</row>
<row>
- <label>Lhasa, Unknown, Tibet</label>
+ <label>Lhasa, Xizang, China</label>
<nb_visits>2</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>4</max_actions>
@@ -186,13 +186,13 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<lat>29.65</lat>
<long>91.1</long>
- <segment>city==Lhasa;regionCode==1;countryCode==ti</segment>
+ <segment>city==Lhasa;regionCode==14;countryCode==cn</segment>
<city_name>Lhasa</city_name>
- <region>1</region>
- <country>ti</country>
- <country_name>Tibet</country_name>
- <region_name>Unknown</region_name>
- <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
+ <region>14</region>
+ <country>cn</country>
+ <country_name>China</country_name>
+ <region_name>Xizang</region_name>
+ <logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
</row>
<row>
<label>London, London, City of, United Kingdom</label>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index 3e1bd4e2cc..c4558671c1 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -113,10 +113,10 @@
<logoHeight>16</logoHeight>
</row>
<row>
- <label>France</label>
+ <label>China</label>
<nb_visits>2</nb_visits>
- <nb_actions>6</nb_actions>
- <max_actions>5</max_actions>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
@@ -135,16 +135,16 @@
<revenue>15</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>fr</code>
- <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
- <segment>countryCode==fr</segment>
+ <code>cn</code>
+ <logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
+ <segment>countryCode==cn</segment>
<logoHeight>16</logoHeight>
</row>
<row>
- <label>Indonesia</label>
+ <label>France</label>
<nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>4</max_actions>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
@@ -163,16 +163,16 @@
<revenue>15</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>id</code>
- <logo>plugins/Morpheus/icons/dist/flags/id.png</logo>
- <segment>countryCode==id</segment>
+ <code>fr</code>
+ <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo>
+ <segment>countryCode==fr</segment>
<logoHeight>16</logoHeight>
</row>
<row>
- <label>Italy</label>
+ <label>Indonesia</label>
<nb_visits>2</nb_visits>
- <nb_actions>6</nb_actions>
- <max_actions>5</max_actions>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
@@ -191,16 +191,16 @@
<revenue>15</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>it</code>
- <logo>plugins/Morpheus/icons/dist/flags/it.png</logo>
- <segment>countryCode==it</segment>
+ <code>id</code>
+ <logo>plugins/Morpheus/icons/dist/flags/id.png</logo>
+ <segment>countryCode==id</segment>
<logoHeight>16</logoHeight>
</row>
<row>
- <label>Macedonia</label>
+ <label>Italy</label>
<nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>4</max_actions>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
@@ -219,13 +219,13 @@
<revenue>15</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>mk</code>
- <logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
- <segment>countryCode==mk</segment>
+ <code>it</code>
+ <logo>plugins/Morpheus/icons/dist/flags/it.png</logo>
+ <segment>countryCode==it</segment>
<logoHeight>16</logoHeight>
</row>
<row>
- <label>Tibet</label>
+ <label>Macedonia</label>
<nb_visits>2</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>4</max_actions>
@@ -247,9 +247,9 @@
<revenue>15</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <code>ti</code>
- <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
- <segment>countryCode==ti</segment>
+ <code>mk</code>
+ <logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
+ <segment>countryCode==mk</segment>
<logoHeight>16</logoHeight>
</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 8e963544ee..9e358630a1 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -240,7 +240,7 @@
<logo>plugins/Morpheus/icons/dist/flags/mk.png</logo>
</row>
<row>
- <label>Unknown, Tibet</label>
+ <label>Xizang, China</label>
<nb_visits>2</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>4</max_actions>
@@ -262,12 +262,12 @@
<revenue>15</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>regionCode==1;countryCode==ti</segment>
- <region>1</region>
- <country>ti</country>
- <country_name>Tibet</country_name>
- <region_name>Unknown</region_name>
- <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo>
+ <segment>regionCode==14;countryCode==cn</segment>
+ <region>14</region>
+ <country>cn</country>
+ <country_name>China</country_name>
+ <region_name>Xizang</region_name>
+ <logo>plugins/Morpheus/icons/dist/flags/cn.png</logo>
</row>
<row>
<label>California, United States</label>
diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png
index ae1c1a9ab4..dc4b931886 100644
--- a/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:763a130436a69516580ba5f0c903715d3e4a433fbc8983da1b555bdb0368453f
-size 246428
+oid sha256:04dfdef354eb3b75d7342dea0ffe8bf4ce102afbfb330bb4bcfbec547b247df7
+size 246227
diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png
index 378d541743..aa6004a698 100644
--- a/tests/UI/expected-screenshots/Dashboard_reset.png
+++ b/tests/UI/expected-screenshots/Dashboard_reset.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3708f066bc45dca4fe1f58454cea6c48abfd32a078ee94dd5b8a674c1bb7bdc9
-size 250604
+oid sha256:dcdeb3f79ef07678939ab5e86c8d18014a185e5d4d5a8c826d80926b996b6f22
+size 250219
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
index 7b11d696fe..897fa2e3ff 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_bounce_rate.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2a7578d136d0239fd10e9d31dd62a25df82d3e2fba621fcb9c1a91cf79e16de8
-size 105448
+oid sha256:35ffcdb418dfd3d030440202f3489c923fae5373c2e5f36bb0b481c4aad67cc3
+size 105185
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_initial.png b/tests/UI/expected-screenshots/EvolutionGraph_initial.png
index 5ac541c5a4..b24b625694 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_initial.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_initial.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2a146aef71baf8d4ec8d40a8e987b3ec63a0cf94ba352dc28ecfdc056ea7320d
-size 47068
+oid sha256:c05b765bdfc7ddc231326154c086ccca055a45c84479b629c2510fe293e79452
+size 47271
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
index 798b3cee5e..89fd23a5b5 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:46ca26af9215104bf2dff118462ecf6db5447e0577b368d9d6c0116a14ea8e54
-size 428797
+oid sha256:404dc2c43f0d24df2c9c15adc282b0a0c9b6941b8f88816cf57e1b7b784042e2
+size 428441
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
index 20b7d4c291..913f994695 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a9e1dbebb762226c741d620cc316c40c8f166da87b321aa0f3ddf2796dc8c1d5
-size 733576
+oid sha256:f676078148169fadf97bf894b4959bab5ad6c44a97d3f506c259a6bcea3bee6a
+size 732743
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
index 37b38ffd5a..9d42ac5a85 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:62cd7d868c9c1815abba501c7ed77a91c4ca0c09c45718ec2213c6a91bc79f38
-size 188330
+oid sha256:16c49417d58bbf49a923bb79392a8dd26cdf8044b23b827c9f14db50cc540c00
+size 187866
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png
index e14182cff4..f0c28f6856 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:154e7aa39b4891cf54a1b8639fc856d8c9b966b5bb3f933d7ff499542bee2db4
-size 172904
+oid sha256:25b260968c60860f6046cac461ec97ca2d2e8498f5227d496fb60c8c89295a58
+size 172614
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
index 918743c31f..14fe8762b8 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d523d13853c0e82e7f6339dff2e2c424ce341dc04ebc8cbf467a629779393fde
-size 113163
+oid sha256:708457e09968c0d581da438ec496bbae755e2c8f648b94e250d051828c1dac4a
+size 112579
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 21:24:08 +0300