Fix unit tests
This commit is contained in:
parent
5334bcce66
commit
89478a0961
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
namespace OCA\DAV\Connector\Sabre;
|
namespace OCA\DAV\Connector\Sabre;
|
||||||
|
|
||||||
|
use OC\Files\Mount\MoveableMount;
|
||||||
use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
|
use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
|
||||||
|
|
||||||
|
|
||||||
|
@ -234,7 +235,14 @@ abstract class Node implements \Sabre\DAV\INode {
|
||||||
*/
|
*/
|
||||||
$mountpoint = $this->info->getMountPoint();
|
$mountpoint = $this->info->getMountPoint();
|
||||||
if (!($mountpoint instanceof MoveableMount)) {
|
if (!($mountpoint instanceof MoveableMount)) {
|
||||||
$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
|
$mountpointpath = $mountpoint->getMountPoint();
|
||||||
|
if (substr($mountpointpath, -1) === '/') {
|
||||||
|
$mountpointpath = substr($mountpointpath, 0, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($mountpointpath === $this->info->getPath()) {
|
||||||
|
$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -108,16 +108,19 @@ class Node extends \Test\TestCase {
|
||||||
*/
|
*/
|
||||||
public function testSharePermissions($type, $permissions, $expected) {
|
public function testSharePermissions($type, $permissions, $expected) {
|
||||||
$storage = $this->getMock('\OCP\Files\Storage');
|
$storage = $this->getMock('\OCP\Files\Storage');
|
||||||
|
|
||||||
$storage->method('getPermissions')->willReturn($permissions);
|
$storage->method('getPermissions')->willReturn($permissions);
|
||||||
|
|
||||||
|
$mountpoint = $this->getMock('\OCP\Files\Mount\IMountPoint');
|
||||||
|
$mountpoint->method('getMountPoint')->willReturn('myPath');
|
||||||
|
|
||||||
$info = $this->getMockBuilder('\OC\Files\FileInfo')
|
$info = $this->getMockBuilder('\OC\Files\FileInfo')
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->setMethods(array('getStorage', 'getType'))
|
->setMethods(['getStorage', 'getType', 'getMountPoint'])
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$info->method('getStorage')->willReturn($storage);
|
$info->method('getStorage')->willReturn($storage);
|
||||||
$info->method('getType')->willReturn($type);
|
$info->method('getType')->willReturn($type);
|
||||||
|
$info->method('getMountPoint')->willReturn($mountpoint);
|
||||||
|
|
||||||
$view = $this->getMock('\OC\Files\View');
|
$view = $this->getMock('\OC\Files\View');
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue