diff options
author | VirtualTam <virtualtam+github@flibidi.net> | 2017-03-04 20:28:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-04 20:28:38 +0100 |
commit | 236239be752a7bb24547237b5751ac4fcbc0e549 (patch) | |
tree | 6e1c0130ea30bf218b9a131f58f7224b6defde3f /tests/api/controllers/InfoTest.php | |
parent | cc30d749ab17be2bf0b623a16f8fa78ecfd5b57d (diff) | |
parent | 3c66e56435359dc678048193e8ee239d06f79b64 (diff) | |
download | Shaarli-236239be752a7bb24547237b5751ac4fcbc0e549.tar.gz Shaarli-236239be752a7bb24547237b5751ac4fcbc0e549.tar.zst Shaarli-236239be752a7bb24547237b5751ac4fcbc0e549.zip |
Merge pull request #788 from virtualtam/application/namespace/config
application: introduce the Shaarli\Config namespace
Diffstat (limited to 'tests/api/controllers/InfoTest.php')
-rw-r--r-- | tests/api/controllers/InfoTest.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/api/controllers/InfoTest.php b/tests/api/controllers/InfoTest.php index 2916eed8..4beef3f7 100644 --- a/tests/api/controllers/InfoTest.php +++ b/tests/api/controllers/InfoTest.php | |||
@@ -1,7 +1,8 @@ | |||
1 | <?php | 1 | <?php |
2 | |||
3 | namespace Shaarli\Api\Controllers; | 2 | namespace Shaarli\Api\Controllers; |
4 | 3 | ||
4 | use Shaarli\Config\ConfigManager; | ||
5 | |||
5 | use Slim\Container; | 6 | use Slim\Container; |
6 | use Slim\Http\Environment; | 7 | use Slim\Http\Environment; |
7 | use Slim\Http\Request; | 8 | use Slim\Http\Request; |
@@ -22,7 +23,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase | |||
22 | protected static $testDatastore = 'sandbox/datastore.php'; | 23 | protected static $testDatastore = 'sandbox/datastore.php'; |
23 | 24 | ||
24 | /** | 25 | /** |
25 | * @var \ConfigManager instance | 26 | * @var ConfigManager instance |
26 | */ | 27 | */ |
27 | protected $conf; | 28 | protected $conf; |
28 | 29 | ||
@@ -46,7 +47,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase | |||
46 | */ | 47 | */ |
47 | public function setUp() | 48 | public function setUp() |
48 | { | 49 | { |
49 | $this->conf = new \ConfigManager('tests/utils/config/configJson.json.php'); | 50 | $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); |
50 | $this->refDB = new \ReferenceLinkDB(); | 51 | $this->refDB = new \ReferenceLinkDB(); |
51 | $this->refDB->write(self::$testDatastore); | 52 | $this->refDB->write(self::$testDatastore); |
52 | 53 | ||
@@ -84,7 +85,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase | |||
84 | $this->assertEquals('Shaarli', $data['settings']['title']); | 85 | $this->assertEquals('Shaarli', $data['settings']['title']); |
85 | $this->assertEquals('?', $data['settings']['header_link']); | 86 | $this->assertEquals('?', $data['settings']['header_link']); |
86 | $this->assertEquals('UTC', $data['settings']['timezone']); | 87 | $this->assertEquals('UTC', $data['settings']['timezone']); |
87 | $this->assertEquals(\ConfigManager::$DEFAULT_PLUGINS, $data['settings']['enabled_plugins']); | 88 | $this->assertEquals(ConfigManager::$DEFAULT_PLUGINS, $data['settings']['enabled_plugins']); |
88 | $this->assertEquals(false, $data['settings']['default_private_links']); | 89 | $this->assertEquals(false, $data['settings']['default_private_links']); |
89 | 90 | ||
90 | $title = 'My links'; | 91 | $title = 'My links'; |