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

Merge pull request #4705 from nextcloud/htaccess-upload

Browse source 
Proper exception for upload of .htaccess file via WebDAV
This commit is contained in:
Roeland Jago Douma 2017-05-09 10:35:38 +02:00 committed by GitHub
commit 07fe15eea5
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/files_versions/tests/VersioningTest.php
View file

@ -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');
}
/**

6
lib/private/Files/View.php
View file

@ -1081,7 +1081,11 @@ class View {
*/
public function free_space($path = '/') {
$this->assertPathLength($path);
return $this->basicOperation('free_space', $path);
$result = $this->basicOperation('free_space', $path);
if ($result === null) {
throw new InvalidPathException();
}
return $result;
}
/**