Rename configuration keys and fix GLOBALS in templates

3 files changed, 22 insertions, 30 deletions

diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php
index 71b59edd..6a841f8a 100644
--- a/tests/utils/config/configJson.json.php
+++ b/tests/utils/config/configJson.json.php
@@ -1,17 +1,28 @@
 <?php /*
 {
-    "redirector":"lala",
-    "login":"root",
-    "hash":"hash",
-    "salt":"salt",
-    "timezone":"Europe\/Paris",
-    "disablesessionprotection":false,
-    "privateLinkByDefault":true,
-    "title": "Shaarli",
-    "titleLink": "?",
+    "credentials": {
+        "login":"root",
+        "hash":"hash",
+        "salt":"salt"
+    },
+    "security": {
+        "session_protection_disabled":false
+    },
+    "general": {
+        "timezone":"Europe\/Paris",
+        "default_private_linksheader_link":true,
+        "title": "Shaarli",
+        "header_link": "?"
+    },
+    "extras": {
+        "redirector":"lala"
+    },
     "config": {
-        "foo": "bar",
-        "DATASTORE": "data\/datastore.php"
+        "foo": "bar"
+    },
+    "path": {
+        "datastore": "tests\/utils\/config\/datastore.php",
+        "data_dir": "tests\/utils\/config"
     },
     "plugins": {
         "WALLABAG_VERSION": 1
diff --git a/tests/utils/config/configUpdateDone.json.php b/tests/utils/config/configUpdateDone.json.php
deleted file mode 100644
index a4e460d1..00000000
--- a/tests/utils/config/configUpdateDone.json.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php /*
-{
-  "login": "root"
-}
diff --git a/tests/utils/config/configUpdater.php b/tests/utils/config/configUpdater.php
deleted file mode 100644
index ee4a56b5..00000000
--- a/tests/utils/config/configUpdater.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php 
-$GLOBALS['login'] = 'login';
-$GLOBALS['hash'] = 'hash';
-$GLOBALS['salt'] = 'salt';
-$GLOBALS['timezone'] = 'Europe/Paris';
-$GLOBALS['title'] = 'title';
-$GLOBALS['titleLink'] = 'titleLink';
-$GLOBALS['redirector'] = '';
-$GLOBALS['disablesessionprotection'] = false;
-$GLOBALS['privateLinkByDefault'] = false;
-$GLOBALS['config']['DATADIR'] = 'tests/Updater';
-$GLOBALS['config']['PAGECACHE'] = 'sandbox/pagecache';
-$GLOBALS['config']['config1'] = 'config1data';
-$GLOBALS['config']['config2'] = 'config2data';
-$GLOBALS['plugins']['WALLABAG_VERSION'] = '2';