aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/config/ConfigJsonTest.php2
-rw-r--r--tests/utils/config/configInvalid.json.php1
-rw-r--r--tests/utils/config/configJson.json.php2
3 files changed, 4 insertions, 1 deletions
diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php
index 359e9112..99c88820 100644
--- a/tests/config/ConfigJsonTest.php
+++ b/tests/config/ConfigJsonTest.php
@@ -88,7 +88,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase
88 } else { 88 } else {
89 $expected = '{"credentials":{"login":"root"},"resource":{"datastore":"data\/datastore.php"},"redirector":{"url":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}'; 89 $expected = '{"credentials":{"login":"root"},"resource":{"datastore":"data\/datastore.php"},"redirector":{"url":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}';
90 } 90 }
91 $expected = ConfigJson::getPhpHeaders() . $expected; 91 $expected = ConfigJson::getPhpHeaders() . $expected . ConfigJson::getPhpSuffix();
92 $this->assertEquals($expected, file_get_contents($dataFile)); 92 $this->assertEquals($expected, file_get_contents($dataFile));
93 unlink($dataFile); 93 unlink($dataFile);
94 } 94 }
diff --git a/tests/utils/config/configInvalid.json.php b/tests/utils/config/configInvalid.json.php
index c53e471d..167f2168 100644
--- a/tests/utils/config/configInvalid.json.php
+++ b/tests/utils/config/configInvalid.json.php
@@ -2,3 +2,4 @@
2{ 2{
3 bad: bad, 3 bad: bad,
4} 4}
5*/ ?> \ No newline at end of file
diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php
index c54882c3..06a302e8 100644
--- a/tests/utils/config/configJson.json.php
+++ b/tests/utils/config/configJson.json.php
@@ -30,3 +30,5 @@
30 "WALLABAG_VERSION": 1 30 "WALLABAG_VERSION": 1
31 } 31 }
32} 32}
33*/ ?>
34