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@matomo.org>2020-10-29 14:23:16 +0300
committerGitHub <noreply@github.com>2020-10-29 14:23:16 +0300
commit67d7df05b92f6bc19f0be034a861caf5d85dc2c1 (patch)
tree622283d5f86eed5477cc00fdcf74170c4a79dfd0 /tests
parent31a5d09719182fde26f59aeccf0292576b2fb7cf (diff)
Fix failing tests (#16629)
* updates expected test files * fix ui test
Diffstat (limited to 'tests')
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml22
-rw-r--r--tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png4
5 files changed, 19 insertions, 19 deletions
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
index 064562f5cf..380f802785 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
@@ -511,36 +511,36 @@ https://www.example.org/</placeholder>
<title>Live</title>
<settings>
<row>
- <name>activate_visitor_log</name>
- <title>Enable visits log</title>
- <value>1</value>
- <defaultValue>1</defaultValue>
+ <name>disable_visitor_log</name>
+ <title>Disable visits log &amp; visitor profile</title>
+ <value>0</value>
+ <defaultValue>0</defaultValue>
<type>boolean</type>
<uiControl>checkbox</uiControl>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
<description />
- <inlineHelp />
+ <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp>
<templateFile />
<introduction />
<condition />
</row>
<row>
- <name>activate_visitor_profile</name>
- <title>Enable visitor profile</title>
- <value>1</value>
- <defaultValue>1</defaultValue>
+ <name>disable_visitor_profile</name>
+ <title>Disable visitor profile only</title>
+ <value>0</value>
+ <defaultValue>0</defaultValue>
<type>boolean</type>
<uiControl>checkbox</uiControl>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
<description />
- <inlineHelp />
+ <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp>
<templateFile />
<introduction />
- <condition>activate_visitor_log==1</condition>
+ <condition>disable_visitor_log==0</condition>
</row>
</settings>
</row>
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index 02f4224737..b7762124a8 100644
--- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
+++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9e8cb6cadc0a2c81c8acd6f072f52f1f8a4f445843cb4f7642446380bba1804a
-size 447579
+oid sha256:bf5607d3659f13c612d520e55342efb42521804cd378d6983ebfb161c59ba5b7
+size 482292
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 84b60458c7..79509b6c7c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:683ff5d0c15c73d0b3375f1e0b2d0b77b514c6557bb9aabb45b69562da4f3c5c
-size 4499185
+oid sha256:3f26847063d6ad9ceebab4926950436701967720b20fac6464339619170c8cf8
+size 4525767
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index f0d83c503d..c836879baf 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:901e095c16b5a42a8bf8e79c56cf2cd189851b7566a3237206347d76b893d149
-size 1056481
+oid sha256:aa032010b15b7a447e2b0249add3ebe95f96f58320f4cf434810fa2af0dc09a7
+size 1091254
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 5129aa171d..4d4fb9bad3 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2fd70e0ad744d39781f3a8ce5b469d47ae48dbd7402a7a565dcd1af024186094
-size 4946409
+oid sha256:fee2c39a422fa433231a64895fadda0f60717f18d89ef417db33ec29d8b43641
+size 4954872