diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-04-13 12:36:47 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-04-13 12:36:47 +0200 |
| commit | 2822d0579e170aa5f58d8726acb8c67e5633b523 (patch) | |
| tree | 2baac013db05cefed3acaf312b7094278900a884 /apps/files_sharing/tests/sharedmount.php | |
| parent | c3fbc2b6fd09bb5b94112da9248cae28d6ef85e3 (diff) | |
| download | nextcloud-server-2822d0579e170aa5f58d8726acb8c67e5633b523.tar.gz nextcloud-server-2822d0579e170aa5f58d8726acb8c67e5633b523.zip | |
Properly add trailing slash to mount point
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
Diffstat (limited to 'apps/files_sharing/tests/sharedmount.php')
| -rw-r--r-- | apps/files_sharing/tests/sharedmount.php | 12 |
1 files changed, 9 insertions, 3 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); |