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

Merge pull request #22650 from owncloud/fix_hook 

Fix verifyExpirationDate passwordSet argument
This commit is contained in:
Thomas Müller 2016-02-26 09:32:41 +01:00
parent 5718402277 9412f69104
commit cbde4bb92f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/share20/manager.php
View File

@ -280,7 +280,7 @@ class Manager implements IManager {
'expirationDate' => &$expirationDate,
'accepted' => &$accepted,
'message' => &$message,
'passwordSet' => $share->getPassword() === null,
'passwordSet' => $share->getPassword() !== null,
]);
if (!$accepted) {

5
tests/lib/share20/managertest.php
View File

@ -787,7 +787,7 @@ class ManagerTest extends \Test\TestCase {
$hookListner = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListner, 'listener');
$hookListner->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
return $data['expirationDate'] == $expected;
return $data['expirationDate'] == $expected && $data['passwordSet'] === false;
}));
$res = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);
@ -799,10 +799,11 @@ class ManagerTest extends \Test\TestCase {
$hookListner = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListner, 'listener');
$hookListner->expects($this->once())->method('listener')->with($this->callback(function ($data) {
return $data['expirationDate'] === null;
return $data['expirationDate'] === null && $data['passwordSet'] === true;
}));
$share = $this->manager->newShare();
$share->setPassword('password');
$date = $this->invokePrivate($this->manager, 'validateExpirationDate', [$share]);