diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-23 21:35:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 21:35:18 +0200 |
| commit | 173f8abc7ed48d2436d8df10ad66bc4907d4bb52 (patch) | |
| tree | cd5c668168515b81e6fd5ef234c27c9eccc1631c /tests | |
| parent | 9275823a3043f392a157da9ddfc5dd1b71c4c236 (diff) | |
| parent | c8cf2e8a5bc6b093cbcd06e93d7599fafe641c06 (diff) | |
| download | nextcloud-server-173f8abc7ed48d2436d8df10ad66bc4907d4bb52.tar.gz nextcloud-server-173f8abc7ed48d2436d8df10ad66bc4907d4bb52.zip | |
Merge pull request #21628 from nextcloud/external-to-s3-trashbin-fix
fix moving files from external storage to object store trashbin
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/Files/ViewTest.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 036fc038a60..fad2217bfdb 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -13,7 +13,6 @@ use OC\Files\Filesystem; use OC\Files\Mount\MountPoint; use OC\Files\Storage\Common; use OC\Files\Storage\Temporary; -use OC\Files\Stream\Quota; use OC\Files\View; use OCP\Constants; use OCP\Files\Config\IMountProvider; @@ -1167,13 +1166,8 @@ class ViewTest extends \Test\TestCase { ->setMethods(['fopen']) ->getMock(); - $storage2->expects($this->any()) - ->method('fopen') - ->willReturnCallback(function ($path, $mode) use ($storage2) { - /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage2 */ - $source = fopen($storage2->getSourcePath($path), $mode); - return Quota::wrap($source, 9); - }); + $storage2->method('writeStream') + ->willReturn(0); $storage1->mkdir('sub'); $storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH'); |