X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2Fconfig%2FConfigJsonTest.php;h=07f6ab49db64953499ab5eb5125eeaf197837ffe;hb=7af9a41881ed0b9d44d18a0ce03a123a8441adf5;hp=359e9112593b8351980c537850bab92a9aff3562;hpb=894a3c4bf38d8dcadb6941049b9167e5101805bd;p=github%2Fshaarli%2FShaarli.git diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php index 359e9112..07f6ab49 100644 --- a/tests/config/ConfigJsonTest.php +++ b/tests/config/ConfigJsonTest.php @@ -41,7 +41,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase * Read a non existent config file -> empty array. * * @expectedException Exception - * @expectedExceptionMessage An error occured while parsing JSON file: error code #4 + * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4 */ public function testReadInvalidJson() { @@ -88,7 +88,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase } else { $expected = '{"credentials":{"login":"root"},"resource":{"datastore":"data\/datastore.php"},"redirector":{"url":"lala"},"plugins":{"WALLABAG_VERSION":"1"}}'; } - $expected = ConfigJson::getPhpHeaders() . $expected; + $expected = ConfigJson::getPhpHeaders() . $expected . ConfigJson::getPhpSuffix(); $this->assertEquals($expected, file_get_contents($dataFile)); unlink($dataFile); }