summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-04 20:43:03 -0300
committerMorris Jobke <hey@morrisjobke.de>2017-05-08 20:03:41 -0500
commitf8044cbbce7e19877754a27ae3d7a0716a67a3ae (patch)
tree3b2dee4b4f4c86c5b5d03d79b09ea064636570d2 /apps/files_versions
parentf6a4028fad57ff2be8752b17c66b990e042cfdf9 (diff)
downloadnextcloud-server-f8044cbbce7e19877754a27ae3d7a0716a67a3ae.tar.gz
nextcloud-server-f8044cbbce7e19877754a27ae3d7a0716a67a3ae.zip
Proper exception for upload of .htaccess file via WebDAV
* fixes #2860 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files_versions')
-rw-r--r--apps/files_versions/tests/VersioningTest.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index a1649b2b600..4cd202113dd 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -289,11 +289,11 @@ class VersioningTest extends \Test\TestCase {
$this->runCommands();
- $this->assertFalse($this->rootView->file_exists($v1));
- $this->assertFalse($this->rootView->file_exists($v2));
+ $this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
+ $this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
- $this->assertTrue($this->rootView->file_exists($v1Renamed));
- $this->assertTrue($this->rootView->file_exists($v2Renamed));
+ $this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
+ $this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
}
public function testRenameInSharedFolder() {
@@ -337,11 +337,11 @@ class VersioningTest extends \Test\TestCase {
self::loginHelper(self::TEST_VERSIONS_USER);
- $this->assertFalse($this->rootView->file_exists($v1));
- $this->assertFalse($this->rootView->file_exists($v2));
+ $this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
+ $this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
- $this->assertTrue($this->rootView->file_exists($v1Renamed));
- $this->assertTrue($this->rootView->file_exists($v2Renamed));
+ $this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
+ $this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
\OC::$server->getShareManager()->deleteShare($share);
}
@@ -553,11 +553,11 @@ class VersioningTest extends \Test\TestCase {
$this->runCommands();
- $this->assertTrue($this->rootView->file_exists($v1));
- $this->assertTrue($this->rootView->file_exists($v2));
+ $this->assertTrue($this->rootView->file_exists($v1), 'version 1 of original file exists');
+ $this->assertTrue($this->rootView->file_exists($v2), 'version 2 of original file exists');
- $this->assertTrue($this->rootView->file_exists($v1Copied));
- $this->assertTrue($this->rootView->file_exists($v2Copied));
+ $this->assertTrue($this->rootView->file_exists($v1Copied), 'version 1 of copied file exists');
+ $this->assertTrue($this->rootView->file_exists($v2Copied), 'version 2 of copied file exists');
}
/**