diff options
| author | Stefan Giehl <stefan@piwik.org> | 2018-07-25 22:09:18 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-07-25 22:09:18 +0300 |
| commit | ef9c48cc48587776107b1500dc14eef3ffa19154 (patch) | |
| tree | cbf32df66ecef4c6c30f0ce1a3ba91d1a272e6ad /tests | |
| parent | 7230b6d2173ee9f9f9237f71f3ca44c97be143c2 (diff) | |
Make CORS domains configurable in UI (#13174)
* Make CORS domain configureable in UI
* Move trusted host settings to SystemSettings class
* Use unique id for pluginSettings
* Improve styling
* Improve help text
* improve code & naming
* Implements new UI field array type
* review adjustments
* reorganize form demo
* update UI files
* update system test files
* Improve handling of Config Settings
Diffstat (limited to 'tests')
5 files changed, 218 insertions, 2 deletions
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 3e96f2dffe..c38b87eae4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -1,6 +1,60 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreAdminHome</pluginName> + <title> </title> + <settings> + <row> + <name>trusted_hosts</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Valid Matomo Hostname</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction>Trusted Matomo Hostname</introduction> + <condition /> + </row> + <row> + <name>cors_domains</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Domain</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>You can define domains or subdomains like http://example.com or http://stats.example.com. Or to allow cross domain requests for all domains simply add a *</inlineHelp> + <templateFile /> + <introduction>Cross-Origin Resource Sharing (CORS) domains</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>GeoIp2</pluginName> <title>Configuration for server variables used by GeoIP 2 server modules</title> <settings> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 3e96f2dffe..c38b87eae4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -1,6 +1,60 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreAdminHome</pluginName> + <title> </title> + <settings> + <row> + <name>trusted_hosts</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Valid Matomo Hostname</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction>Trusted Matomo Hostname</introduction> + <condition /> + </row> + <row> + <name>cors_domains</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Domain</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>You can define domains or subdomains like http://example.com or http://stats.example.com. Or to allow cross domain requests for all domains simply add a *</inlineHelp> + <templateFile /> + <introduction>Cross-Origin Resource Sharing (CORS) domains</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>GeoIp2</pluginName> <title>Configuration for server variables used by GeoIP 2 server modules</title> <settings> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 3e96f2dffe..c38b87eae4 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -1,6 +1,60 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreAdminHome</pluginName> + <title> </title> + <settings> + <row> + <name>trusted_hosts</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Valid Matomo Hostname</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction>Trusted Matomo Hostname</introduction> + <condition /> + </row> + <row> + <name>cors_domains</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Domain</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>You can define domains or subdomains like http://example.com or http://stats.example.com. Or to allow cross domain requests for all domains simply add a *</inlineHelp> + <templateFile /> + <introduction>Cross-Origin Resource Sharing (CORS) domains</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>GeoIp2</pluginName> <title>Configuration for server variables used by GeoIP 2 server modules</title> <settings> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 3e96f2dffe..c38b87eae4 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -1,6 +1,60 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreAdminHome</pluginName> + <title> </title> + <settings> + <row> + <name>trusted_hosts</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Valid Matomo Hostname</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction>Trusted Matomo Hostname</introduction> + <condition /> + </row> + <row> + <name>cors_domains</name> + <title /> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>field-array</uiControl> + <uiControlAttributes> + <field> + <title>Domain</title> + <uiControl>text</uiControl> + <templateFile /> + <availableValues /> + </field> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>You can define domains or subdomains like http://example.com or http://stats.example.com. Or to allow cross domain requests for all domains simply add a *</inlineHelp> + <templateFile /> + <introduction>Cross-Origin Resource Sharing (CORS) domains</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>GeoIp2</pluginName> <title>Configuration for server variables used by GeoIP 2 server modules</title> <settings> diff --git a/tests/UI/expected-screenshots/Theme_demo.png b/tests/UI/expected-screenshots/Theme_demo.png index 14dd153fd6..e8fd13b6cc 100644 --- a/tests/UI/expected-screenshots/Theme_demo.png +++ b/tests/UI/expected-screenshots/Theme_demo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f9eb743a3d2aa85938ac1bfbd25a236fdaea36e49fcbe0daa456b1310d1c30b -size 1151342 +oid sha256:da785a8718dfcda24e8d5e1e4fc086bfb4b653b62aea32ec3354dc1d07e74a2f +size 1512516 |
