aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-09 22:20:02 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-09 22:20:02 +0200
commit28e4542b580177b8acad056a400e2478178e2ac3 (patch)
tree9747a07c28fbe7e41dcf635fb0ae9ffbd69e40a1
parentd52e197b0d7f467b553d5773cc9c89b7380c24d2 (diff)
parent08afce3d7e1221170948c460ac2d052d25070403 (diff)
downloadnextcloud-server-28e4542b580177b8acad056a400e2478178e2ac3.tar.gz
nextcloud-server-28e4542b580177b8acad056a400e2478178e2ac3.zip
Merge pull request #17530 from owncloud/proper-config-for-singleuser-command
[command] single user mode - use config object & add tests
-rw-r--r--core/command/maintenance/singleuser.php19
-rw-r--r--core/register_command.php2
-rw-r--r--tests/core/command/maintenance/singleusertest.php129
3 files changed, 146 insertions, 4 deletions
diff --git a/core/command/maintenance/singleuser.php b/core/command/maintenance/singleuser.php
index f647a3f501d..44e124e9d3b 100644
--- a/core/command/maintenance/singleuser.php
+++ b/core/command/maintenance/singleuser.php
@@ -27,8 +27,21 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
+use OCP\IConfig;
+
class SingleUser extends Command {
+ /** @var IConfig */
+ protected $config;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config) {
+ $this->config = $config;
+ parent::__construct();
+ }
+
protected function configure() {
$this
->setName('maintenance:singleuser')
@@ -49,13 +62,13 @@ class SingleUser extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
if ($input->getOption('on')) {
- \OC_Config::setValue('singleuser', true);
+ $this->config->setSystemValue('singleuser', true);
$output->writeln('Single user mode enabled');
} elseif ($input->getOption('off')) {
- \OC_Config::setValue('singleuser', false);
+ $this->config->setSystemValue('singleuser', false);
$output->writeln('Single user mode disabled');
} else {
- if (\OC_Config::getValue('singleuser', false)) {
+ if ($this->config->getSystemValue('singleuser', false)) {
$output->writeln('Single user mode is currently enabled');
} else {
$output->writeln('Single user mode is currently disabled');
diff --git a/core/register_command.php b/core/register_command.php
index 8815eca6b6b..6cd81b4c3b7 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -61,7 +61,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\Maintenance\MimeTypesJS());
$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
- $application->add(new OC\Core\Command\Maintenance\SingleUser());
+ $application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig()));
diff --git a/tests/core/command/maintenance/singleusertest.php b/tests/core/command/maintenance/singleusertest.php
new file mode 100644
index 00000000000..6629f39564f
--- /dev/null
+++ b/tests/core/command/maintenance/singleusertest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Tests\Core\Command\Maintenance;
+
+
+use OC\Core\Command\Maintenance\SingleUser;
+use Test\TestCase;
+
+class SingleUserTest extends TestCase {
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ protected $config;
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ protected $consoleInput;
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ protected $consoleOutput;
+
+ /** @var \Symfony\Component\Console\Command\Command */
+ protected $command;
+
+ protected function setUp() {
+ parent::setUp();
+
+ $config = $this->config = $this->getMockBuilder('OCP\IConfig')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+ $this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+ /** @var \OCP\IConfig $config */
+ $this->command = new SingleUser($config);
+ }
+
+ public function testChangeStateToOn() {
+
+ $this->consoleInput->expects($this->once())
+ ->method('getOption')
+ ->with('on')
+ ->willReturn(true);
+
+ $this->config->expects($this->once())
+ ->method('setSystemValue')
+ ->with('singleuser', true);
+
+ $this->consoleOutput->expects($this->once())
+ ->method('writeln')
+ ->with('Single user mode enabled');
+
+ self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+ }
+
+ public function testChangeStateToOff() {
+
+ $this->consoleInput->expects($this->at(0))
+ ->method('getOption')
+ ->with('on')
+ ->willReturn(false);
+
+ $this->consoleInput->expects($this->at(1))
+ ->method('getOption')
+ ->with('off')
+ ->willReturn(true);
+
+ $this->config->expects($this->once())
+ ->method('setSystemValue')
+ ->with('singleuser', false);
+
+ $this->consoleOutput->expects($this->once())
+ ->method('writeln')
+ ->with('Single user mode disabled');
+
+ self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+ }
+
+ public function stateData() {
+ return [
+ [ true, 'Single user mode is currently enabled' ],
+ [ false, 'Single user mode is currently disabled' ],
+ ];
+ }
+
+ /**
+ * @dataProvider stateData
+ *
+ * @param $state
+ * @param $expectedOutput
+ */
+ public function testState($state, $expectedOutput) {
+
+ $this->consoleInput->expects($this->at(0))
+ ->method('getOption')
+ ->with('on')
+ ->willReturn(false);
+
+ $this->consoleInput->expects($this->at(1))
+ ->method('getOption')
+ ->with('off')
+ ->willReturn(false);
+
+ $this->config->expects($this->once())
+ ->method('getSystemValue')
+ ->with('singleuser', false)
+ ->willReturn($state);
+
+ $this->consoleOutput->expects($this->once())
+ ->method('writeln')
+ ->with($expectedOutput);
+
+ self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+ }
+}