Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] Fix #33630. Fix cannot set 0 as value for config through OCC command #33643

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/files_external/lib/Command/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ protected function execute(InputInterface $input, OutputInterface $output) {
}

$value = $input->getArgument('value');
if ($value) {

if ($value !== null) {
$this->setOption($mount, $key, $value, $output);
} else {
$this->getOption($mount, $key, $output);
Expand Down
96 changes: 96 additions & 0 deletions apps/files_external/tests/Command/ConfigCommandTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?php

/**
* @author Saugat Pachhai <[email protected]>
* @author Artur Neumann <[email protected]>
*
* @copyright Copyright (c) 2018, ownCloud GmbH
* @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 OCA\Files_External\Tests\Command;

use OCA\Files_External\Command\Config;
use Symfony\Component\Console\Output\BufferedOutput;

class ConfigCommandTest extends CommandTest {
private function getInstance($storageService) {
return new Config($storageService);
}

/**
* @dataProvider optionsProvider
*
* @param mixed $value
*
* @return void
*/
public function testGetConfigValue($value) {
$mount = $this->getMount(1, '', '', [], ['filesystem_check_changes' => $value]);

$storageService = $this->getGlobalStorageService([$mount]);
$command = $this->getInstance($storageService);

$input = $this->getInput(
$command,
[
'mount_id' => 1,
'key' => 'filesystem_check_changes'
],
['output' => 'json']
);

$result = \trim($this->executeCommand($command, $input));
$this->assertEquals($value, $result);
}

/**
* @dataProvider optionsProvider
*
* @param mixed $value
*
* @return void
*/
public function testSetConfigValue($value) {
$mount = $this->getMount(1, '', '');

$storageService = $this->getGlobalStorageService([$mount]);
$command = $this->getInstance($storageService);

$input = $this->getInput(
$command,
[
'mount_id' => 1,
'key' => 'filesystem_check_changes',
'value' => $value
],
[ 'output' => 'json']
);

$result = \trim($this->executeCommand($command, $input));
$this->assertEquals('', $result);

$output = new BufferedOutput();
$result = $this->invokePrivate($command, 'getOption', [$mount, 'filesystem_check_changes', $output]);
$this->assertEquals($value, \trim($output->fetch()));
}

public function optionsProvider() {
return [
[0], [1], ['true']
];
}
}