wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly add trailing slash to mount point

Browse source 
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
This commit is contained in:
Vincent Petry 2015-04-13 12:36:47 +02:00
parent c3fbc2b6fd
commit 2822d0579e
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/files_sharing/tests/sharedmount.php
View file

@ -144,14 +144,20 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
\OC\Files\Filesystem::rename($this->filename, "newFileName");
\OC\Files\Filesystem::rename($this->filename, $this->filename . '_renamed');
$this->assertTrue(\OC\Files\Filesystem::file_exists('newFileName'));
$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename . '_renamed'));
$this->assertFalse(\OC\Files\Filesystem::file_exists($this->filename));
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
$this->assertFalse(\OC\Files\Filesystem::file_exists("newFileName"));
$this->assertFalse(\OC\Files\Filesystem::file_exists($this->filename . '_renamed'));
// rename back to original name
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
\OC\Files\Filesystem::rename($this->filename . '_renamed', $this->filename);
$this->assertFalse(\OC\Files\Filesystem::file_exists($this->filename . '_renamed'));
$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
//cleanup
\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2);

4
lib/private/files/mount/mountpoint.php
View file

@ -113,10 +113,12 @@ class MountPoint implements IMountPoint {
}
/**
* Sets the mount point path, relative to data/
*
* @param string $mountPoint new mount point
*/
public function setMountPoint($mountPoint) {
$this->mountPoint = $mountPoint;
$this->mountPoint = $this->formatPath($mountPoint);
}
/**

4
tests/lib/files/mount/mountpoint.php
View file

@ -31,6 +31,10 @@ class MountPoint extends \Test\TestCase {
$this->assertEquals($storage, $mountPoint->getStorage());
$this->assertEquals(123, $mountPoint->getStorageId());
$this->assertEquals('/mountpoint/', $mountPoint->getMountPoint());
$mountPoint->setMountPoint('another');
$this->assertEquals('/another/', $mountPoint->getMountPoint());
}
public function testInvalidStorage() {