From 5370bba0b69aaba94567604ab99661a528d5b052 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 8 May 2015 09:58:47 +0200 Subject: Split the system from the app config --- tests/core/command/config/listconfigstest.php | 33 +++++++++++++++------------ 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'tests/core') diff --git a/tests/core/command/config/listconfigstest.php b/tests/core/command/config/listconfigstest.php index 2d65e957621..4ea4a92cf81 100644 --- a/tests/core/command/config/listconfigstest.php +++ b/tests/core/command/config/listconfigstest.php @@ -23,7 +23,6 @@ namespace Tests\Core\Command\Config; use OC\Core\Command\Config\ListConfigs; -use OC\Core\Command\Config\NoValue; use Test\TestCase; class ListConfigsTest extends TestCase { @@ -58,7 +57,7 @@ class ListConfigsTest extends TestCase { } - public function dataDisable() { + public function listData() { return [ [ 'all', @@ -82,15 +81,17 @@ class ListConfigsTest extends TestCase { ], true, json_encode([ - 'core' => [ - 'global_cache_gc_lastrun' => '1430388388', - ], - 'files' => [ - 'enabled' => 'yes', - ], 'system' => [ 'overwrite.cli.url' => 'http://localhost', ], + 'apps' => [ + 'core' => [ + 'global_cache_gc_lastrun' => '1430388388', + ], + 'files' => [ + 'enabled' => 'yes', + ], + ], ]), ], [ @@ -115,16 +116,18 @@ class ListConfigsTest extends TestCase { ], false, json_encode([ - 'core' => [ - 'global_cache_gc_lastrun' => '1430388388', - ], - 'files' => [ - 'enabled' => 'yes', - ], 'system' => [ 'secret' => 'my secret', 'overwrite.cli.url' => 'http://localhost', ], + 'apps' => [ + 'core' => [ + 'global_cache_gc_lastrun' => '1430388388', + ], + 'files' => [ + 'enabled' => 'yes', + ], + ], ]), ], [ @@ -232,7 +235,7 @@ class ListConfigsTest extends TestCase { } /** - * @dataProvider dataDisable + * @dataProvider listData * * @param string $app * @param array $systemConfigs -- cgit v1.2.3