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:
authorThomas Steur <thomas.steur@gmail.com>2016-01-14 06:45:01 +0300
committerThomas Steur <thomas.steur@gmail.com>2016-01-15 00:44:30 +0300
commitb12c069769e856f43c6f509d6e3528031795440e (patch)
tree79ace84370835a6f4c8a06c830b49c4753c51c1b /tests
parent95ca1edf95f0518fd09f5efffbac719b9ce0e4c3 (diff)
add possibility to view config values, including description, default value and whether it is an adjusted config value in the ui
Diffstat (limited to 'tests')
-rw-r--r--tests/UI/specs/UIIntegration_spec.js6
-rw-r--r--tests/resources/Config/global.ini.php4
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index 65fa37d721..9703f28814 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -498,6 +498,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
}, done);
});
+ it('should load the config file page correctly', function (done) {
+ expect.screenshot('admin_diagnostics_configfile').to.be.captureSelector('.pageWrap', function (page) {
+ page.load("?" + generalParams + "&module=Diagnostics&action=configfile");
+ }, done);
+ });
+
it('should load the Settings > Visitor Generator admin page correctly', function (done) {
expect.screenshot('admin_visitor_generator').to.be.captureSelector('.pageWrap', function (page) {
page.load("?" + generalParams + "&module=VisitorGenerator&action=index");
diff --git a/tests/resources/Config/global.ini.php b/tests/resources/Config/global.ini.php
index 20271ed43d..87e1437453 100644
--- a/tests/resources/Config/global.ini.php
+++ b/tests/resources/Config/global.ini.php
@@ -3,10 +3,14 @@ key1 = value1
key2 = value2
[CategoryOnlyInGlobalFile]
+; test comment
key3 = "value3"
+; test comment 4
key4 = value4
[TestArray]
+; test comment 2
+; with multiple lines
installed[] = plugin1
installed[] = plugin4