From 894a3c4bf38d8dcadb6941049b9167e5101805bd Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 11 Jun 2016 09:08:02 +0200
Subject: Rename configuration key for better sections

---
 tests/config/ConfigJsonTest.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests/config/ConfigJsonTest.php')

diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php
index 0960c729..359e9112 100644
--- a/tests/config/ConfigJsonTest.php
+++ b/tests/config/ConfigJsonTest.php
@@ -24,8 +24,8 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
     {
         $conf = $this->configIO->read('tests/utils/config/configJson.json.php');
         $this->assertEquals('root', $conf['credentials']['login']);
-        $this->assertEquals('lala', $conf['extras']['redirector']);
-        $this->assertEquals('tests/utils/config/datastore.php', $conf['path']['datastore']);
+        $this->assertEquals('lala', $conf['redirector']['url']);
+        $this->assertEquals('tests/utils/config/datastore.php', $conf['resource']['datastore']);
         $this->assertEquals('1', $conf['plugins']['WALLABAG_VERSION']);
     }
 
@@ -58,11 +58,11 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
             'credentials' => array(
                 'login' => 'root',
             ),
-            'path' => array(
+            'resource' => array(
                 'datastore' => 'data/datastore.php',
             ),
-            'extras' => array(
-                'redirector' => 'lala',
+            'redirector' => array(
+                'url' => 'lala',
             ),
             'plugins' => array(
                 'WALLABAG_VERSION' => '1',
@@ -75,18 +75,18 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
     "credentials": {
         "login": "root"
     },
-    "path": {
+    "resource": {
         "datastore": "data\/datastore.php"
     },
-    "extras": {
-        "redirector": "lala"
+    "redirector": {
+        "url": "lala"
     },
     "plugins": {
         "WALLABAG_VERSION": "1"
     }
 }';
         } else {
-            $expected = '{"credentials":{"login":"root"},"path":{"datastore":"data\/datastore.php"},"extras":{"redirector":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}';
+            $expected = '{"credentials":{"login":"root"},"resource":{"datastore":"data\/datastore.php"},"redirector":{"url":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}';
         }
         $expected = ConfigJson::getPhpHeaders() . $expected;
         $this->assertEquals($expected, file_get_contents($dataFile));
@@ -102,10 +102,10 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
         $dest = 'tests/utils/config/configOverwrite.json.php';
         copy($source, $dest);
         $conf = $this->configIO->read($dest);
-        $conf['extras']['redirector'] = 'blabla';
+        $conf['redirector']['url'] = 'blabla';
         $this->configIO->write($dest, $conf);
         $conf = $this->configIO->read($dest);
-        $this->assertEquals('blabla', $conf['extras']['redirector']);
+        $this->assertEquals('blabla', $conf['redirector']['url']);
         unlink($dest);
     }
 
-- 
cgit v1.2.3