diff options
author | Stefan Giehl <stefan@matomo.org> | 2020-10-19 20:15:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-19 20:15:00 +0300 |
commit | 619ee9b48c5f11bbea38a8cf35f4a06b8fba0e11 (patch) | |
tree | f193503258cc0cf7a825ae2786ace92e1022691e /tests | |
parent | 85618037852baa54631fbc9fbb42170afcde7553 (diff) |
Adds measuarable settings to disable visits log and visitor profile (#16561)
* Adds measuarable settings to disable visits log and visitor profile
* updates expected test files
* Adds some UI tests to check deactivating visitor log / profile works
* code improvements
* more ui tests
* Adds global system settings to disable visits log / profile
* adds UI tests for system setting
* updates expected screenshots
* code improvement
* improve tests
* reset custom logo usage after test
* updates expected screenshots
* use transient cache
Diffstat (limited to 'tests')
9 files changed, 92 insertions, 16 deletions
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 5321b677e5..a5c7472880 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -222,6 +222,44 @@ https://www.example.org/</placeholder> </settings> </row> <row> + <pluginName>Live</pluginName> + <title>Live</title> + <settings> + <row> + <name>activate_visitor_log</name> + <title>Enable visits log</title> + <value>1</value> + <defaultValue>1</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>activate_visitor_profile</name> + <title>Enable visitor profile</title> + <value>1</value> + <defaultValue>1</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>ExampleSettingsPlugin</pluginName> <title>ExampleSettingsPlugin</title> <settings> @@ -469,6 +507,44 @@ https://www.example.org/</placeholder> </settings> </row> <row> + <pluginName>Live</pluginName> + <title>Live</title> + <settings> + <row> + <name>activate_visitor_log</name> + <title>Enable visits log</title> + <value>1</value> + <defaultValue>1</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>activate_visitor_profile</name> + <title>Enable visitor profile</title> + <value>1</value> + <defaultValue>1</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>ExampleSettingsPlugin</pluginName> <title>ExampleSettingsPlugin</title> <settings> diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 6bc645751b..02f4224737 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:2e840f362e069d3e30b3629bf01e6bbf89a3ce23518112af1affd9bcd9818886 -size 440550 +oid sha256:9e8cb6cadc0a2c81c8acd6f072f52f1f8a4f445843cb4f7642446380bba1804a +size 447579 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index fe89e281d0..f63097f640 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:f1107da0ab9dad0819d7190b7bd11045507bc9232e5be6d7506ce057058351e7 -size 4449780 +oid sha256:736673adf097edb8310e6a2842d5393ab384584da8dd8a824fea4fbf95fdce1c +size 4459413 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index a92daabe25..af61e8b822 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14e3a63311db7a29fc661a7549379803df19a68fe05f9e26f0141ec41124b80a -size 1068349 +oid sha256:15e7af3dd4c54248b70a95c565d6e3e705a74eea6c913141a482a367177eb5df +size 1069526 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index 3878c75549..864cb0747a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7c42a9fe4b0c3d5d41194c672115395c46bd1bdb2d28319b93ecca7fa706ad5 -size 1069838 +oid sha256:aaa3bfb7b4addb2dc837fbbe76cd0916f73292355519d7b668040b5cfdf644a2 +size 1070728 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index a5d8af7c6b..f0d83c503d 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:63c7c496cbda8f3b9021884587032c5cf90a2face76a3c9ef0b8cc3de5fed950 -size 1045165 +oid sha256:901e095c16b5a42a8bf8e79c56cf2cd189851b7566a3237206347d76b893d149 +size 1056481 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 8198fbcab3..58b3cea011 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1601225dfb791d50186c8310d79297f573cb5c86d741bb51450093e1fc969854 -size 1562420 +oid sha256:20f0a1d5d0279e3ef4beb00e05e7a25cbdd85ea35980bfacf511161402a5105d +size 1562515 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png index 2d846b5040..e6e036ef12 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:085e8ad151eb72357b108f8c5bb33dae5ce05704bb40cae46a203bced3290baa -size 76304 +oid sha256:3d3a5c3f888be7bb43da1701aaf1edb47f2ca25a751d84c48b4a00767916c308 +size 76395 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png index 2d846b5040..e6e036ef12 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:085e8ad151eb72357b108f8c5bb33dae5ce05704bb40cae46a203bced3290baa -size 76304 +oid sha256:3d3a5c3f888be7bb43da1701aaf1edb47f2ca25a751d84c48b4a00767916c308 +size 76395 |