X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FApplicationUtilsTest.php;h=4a0975bf0b157e2db9c4ad5499d964730d10d8ef;hb=709007d043981a0a8256ab40fe03d705ad496b60;hp=cf82b655544dac8c86bee3aa8cd8cd6efe9b9bd2;hpb=684e662a58b02bde225e44d3677987b6fc3adf0b;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index cf82b655..4a0975bf 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -64,7 +64,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
             self::$versionPattern,
             ApplicationUtils::getLatestGitVersionCode(
                 'https://raw.githubusercontent.com/shaarli/Shaarli/'
-               .'master/shaarli_version.php',
+               .'stable/shaarli_version.php',
                 $testTimeout
             )
         );
@@ -75,9 +75,12 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLatestGitVersionCodeInvalidUrl()
     {
+        $oldlog = ini_get('error_log');
+        ini_set('error_log', '/dev/null');
         $this->assertFalse(
             ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 1)
         );
+        ini_set('error_log', $oldlog);
     }
 
     /**
@@ -276,21 +279,21 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
      */
     public function testCheckCurrentResourcePermissions()
     {
-        $conf = ConfigManager::getInstance();
-        $conf->set('config.CACHEDIR', 'cache');
-        $conf->set('config.CONFIG_FILE', 'data/config.php');
-        $conf->set('config.DATADIR', 'data');
-        $conf->set('config.DATASTORE', 'data/datastore.php');
-        $conf->set('config.IPBANS_FILENAME', 'data/ipbans.php');
-        $conf->set('config.LOG_FILE', 'data/log.txt');
-        $conf->set('config.PAGECACHE', 'pagecache');
-        $conf->set('config.RAINTPL_TMP', 'tmp');
-        $conf->set('config.RAINTPL_TPL', 'tpl');
-        $conf->set('config.UPDATECHECK_FILENAME', 'data/lastupdatecheck.txt');
+        $conf = new ConfigManager('');
+        $conf->set('resource.thumbnails_cache', 'cache');
+        $conf->set('resource.config', 'data/config.php');
+        $conf->set('resource.data_dir', 'data');
+        $conf->set('resource.datastore', 'data/datastore.php');
+        $conf->set('resource.ban_file', 'data/ipbans.php');
+        $conf->set('resource.log', 'data/log.txt');
+        $conf->set('resource.page_cache', 'pagecache');
+        $conf->set('resource.raintpl_tmp', 'tmp');
+        $conf->set('resource.raintpl_tpl', 'tpl');
+        $conf->set('resource.update_check', 'data/lastupdatecheck.txt');
 
         $this->assertEquals(
             array(),
-            ApplicationUtils::checkResourcePermissions()
+            ApplicationUtils::checkResourcePermissions($conf)
         );
     }
 
@@ -299,17 +302,17 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
      */
     public function testCheckCurrentResourcePermissionsErrors()
     {
-        $conf = ConfigManager::getInstance();
-        $conf->set('config.CACHEDIR', 'null/cache');
-        $conf->set('config.CONFIG_FILE', 'null/data/config.php');
-        $conf->set('config.DATADIR', 'null/data');
-        $conf->set('config.DATASTORE', 'null/data/store.php');
-        $conf->set('config.IPBANS_FILENAME', 'null/data/ipbans.php');
-        $conf->set('config.LOG_FILE', 'null/data/log.txt');
-        $conf->set('config.PAGECACHE', 'null/pagecache');
-        $conf->set('config.RAINTPL_TMP', 'null/tmp');
-        $conf->set('config.RAINTPL_TPL', 'null/tpl');
-        $conf->set('config.UPDATECHECK_FILENAME', 'null/data/lastupdatecheck.txt');
+        $conf = new ConfigManager('');
+        $conf->set('resource.thumbnails_cache', 'null/cache');
+        $conf->set('resource.config', 'null/data/config.php');
+        $conf->set('resource.data_dir', 'null/data');
+        $conf->set('resource.datastore', 'null/data/store.php');
+        $conf->set('resource.ban_file', 'null/data/ipbans.php');
+        $conf->set('resource.log', 'null/data/log.txt');
+        $conf->set('resource.page_cache', 'null/pagecache');
+        $conf->set('resource.raintpl_tmp', 'null/tmp');
+        $conf->set('resource.raintpl_tpl', 'null/tpl');
+        $conf->set('resource.update_check', 'null/data/lastupdatecheck.txt');
         $this->assertEquals(
             array(
                 '"null/tpl" directory is not readable',
@@ -322,7 +325,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
                 '"null/tmp" directory is not readable',
                 '"null/tmp" directory is not writable'
             ),
-            ApplicationUtils::checkResourcePermissions()
+            ApplicationUtils::checkResourcePermissions($conf)
         );
     }
 }