diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-13 13:16:07 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-13 13:16:07 +0200 |
| commit | a88e013f722a2bf30100074760509613c76ca807 (patch) | |
| tree | 5e436a6f6973206ada03c870b07e4407f7e5e0a1 | |
| parent | b67301ef998663df86abe7f24127910e0aa110be (diff) | |
| parent | 2822d0579e170aa5f58d8726acb8c67e5633b523 (diff) | |
| download | nextcloud-server-a88e013f722a2bf30100074760509613c76ca807.tar.gz nextcloud-server-a88e013f722a2bf30100074760509613c76ca807.zip | |
Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
Properly add trailing slash to mount point
| -rw-r--r-- | apps/files_sharing/tests/sharedmount.php | 12 | ||||
| -rw-r--r-- | lib/private/files/mount/mountpoint.php | 4 | ||||
| -rw-r--r-- | tests/lib/files/mount/mountpoint.php | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index f64e1913905..ff4cb4c0e49 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -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); diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php index 30c06790944..f1e492c8603 100644 --- a/lib/private/files/mount/mountpoint.php +++ b/lib/private/files/mount/mountpoint.php @@ -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); } /** diff --git a/tests/lib/files/mount/mountpoint.php b/tests/lib/files/mount/mountpoint.php index 5a9c6de3e0a..29610e6058d 100644 --- a/tests/lib/files/mount/mountpoint.php +++ b/tests/lib/files/mount/mountpoint.php @@ -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() { |