Merge branch 'master' into patch-headers-already-sent

This commit is contained in:
Robin Appelman 2014-02-21 11:23:06 +01:00
commit 292525d10b
1 changed files with 0 additions and 15 deletions

View File

@ -48,21 +48,6 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
$etag = $file->put('test data'); $etag = $file->put('test data');
} }
/**
* Test setting name with setName()
*/
public function testSetName() {
// setup
$file = new OC_Connector_Sabre_File('/test.txt');
$file->fileView = $this->getMock('\OC\Files\View', array('isUpdatable'), array(), '', FALSE);
$file->fileView->expects($this->any())->method('isUpdatable')->withAnyParameters()->will($this->returnValue(true));
$etag = $file->put('test data');
$file->setName('/renamed.txt');
$this->assertTrue($file->fileView->file_exists('/renamed.txt'));
// clean up
$file->delete();
}
/** /**
* Test setting name with setName() with invalid chars * Test setting name with setName() with invalid chars
* @expectedException Sabre_DAV_Exception_BadRequest * @expectedException Sabre_DAV_Exception_BadRequest