mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only check if the user exists if a user was added as parameter

This commit is contained in:
Bjoern Schiessle 2015-09-24 12:21:40 +02:00
parent 330ea18996
commit d697ea58a4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/encryption/decryptall.php
View File

@ -80,7 +80,7 @@ class DecryptAll {
$this->input = $input;
$this->output = $output;
if ($user !== '' && $this->userManager->userExists($user) === false) {
if (!empty($user) && $this->userManager->userExists($user) === false) {
$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
return false;
}

16
tests/lib/encryption/decryptalltest.php
View File

@ -82,11 +82,13 @@ class DecryptAllTest extends TestCase {
* @dataProvider dataTrueFalse
* @param bool $prepareResult
*/
public function testDecryptAll($prepareResult) {
public function testDecryptAll($prepareResult, $user) {
$user = 'user1';
$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
if (!empty($user)) {
$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
} else {
$this->userManager->expects($this->never())->method('userExists');
}
/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject | $instance */
$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
->setConstructorArgs(
@ -117,8 +119,10 @@ class DecryptAllTest extends TestCase {
public function dataTrueFalse() {
return [
[true],
[false]
[true, 'user1'],
[false, 'user1'],
[true, ''],
[true, null]
];
}