From eeea1c3daa87f133c57c96fa17ed26b02c392636 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 29 May 2016 14:41:30 +0200 Subject: Use the configuration manager for wallabag and readityourself plugin --- tests/plugins/PluginReadityourselfTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/plugins/PluginReadityourselfTest.php') diff --git a/tests/plugins/PluginReadityourselfTest.php b/tests/plugins/PluginReadityourselfTest.php index 8bf17bf1..bc5da042 100644 --- a/tests/plugins/PluginReadityourselfTest.php +++ b/tests/plugins/PluginReadityourselfTest.php @@ -25,7 +25,8 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase */ function testReadityourselfLinklist() { - $GLOBALS['plugins']['READITYOUSELF_URL'] = 'value'; + $conf = ConfigManager::getInstance(); + $conf->set('plugins.READITYOUSELF_URL', 'value'); $str = 'http://randomstr.com/test'; $data = array( 'title' => $str, @@ -52,7 +53,8 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase */ function testReadityourselfLinklistWithoutConfig() { - unset($GLOBALS['plugins']['READITYOUSELF_URL']); + $conf = ConfigManager::getInstance(); + $conf->set('plugins.READITYOUSELF_URL', null); $str = 'http://randomstr.com/test'; $data = array( 'title' => $str, -- cgit v1.2.3 From 51def0d84955c7a951bd091eb5eeb3fce9deabd4 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 9 Jun 2016 20:04:32 +0200 Subject: PluginManager no longer uses singleton pattern --- tests/plugins/PluginReadityourselfTest.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/plugins/PluginReadityourselfTest.php') diff --git a/tests/plugins/PluginReadityourselfTest.php b/tests/plugins/PluginReadityourselfTest.php index bc5da042..d73e666a 100644 --- a/tests/plugins/PluginReadityourselfTest.php +++ b/tests/plugins/PluginReadityourselfTest.php @@ -4,6 +4,8 @@ * PluginReadityourselfTest.php.php */ +// FIXME! add an init method. +$conf = new ConfigManager(''); require_once 'plugins/readityourself/readityourself.php'; /** @@ -25,7 +27,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase */ function testReadityourselfLinklist() { - $conf = ConfigManager::getInstance(); + $conf = new ConfigManager(''); $conf->set('plugins.READITYOUSELF_URL', 'value'); $str = 'http://randomstr.com/test'; $data = array( @@ -37,7 +39,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase ) ); - $data = hook_readityourself_render_linklist($data); + $data = hook_readityourself_render_linklist($data, $conf); $link = $data['links'][0]; // data shouldn't be altered $this->assertEquals($str, $data['title']); @@ -53,7 +55,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase */ function testReadityourselfLinklistWithoutConfig() { - $conf = ConfigManager::getInstance(); + $conf = new ConfigManager(''); $conf->set('plugins.READITYOUSELF_URL', null); $str = 'http://randomstr.com/test'; $data = array( @@ -65,7 +67,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase ) ); - $data = hook_readityourself_render_linklist($data); + $data = hook_readityourself_render_linklist($data, $conf); $link = $data['links'][0]; // data shouldn't be altered $this->assertEquals($str, $data['title']); -- cgit v1.2.3