diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-04-28 10:58:50 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-28 10:58:50 +0200 |
| commit | de8c15e1a46e33a20af1bad97a8cf27fced84539 (patch) | |
| tree | 36a46b15dcf68d2d5feea06d7b57f4b8701321f5 /tests | |
| parent | 5fa5f46a88371322fa37e1e34ebc73ccea6c42b1 (diff) | |
| parent | 5304afbecb37b841312e35594ef8cba403a4cd8c (diff) | |
| download | nextcloud-server-de8c15e1a46e33a20af1bad97a8cf27fced84539.tar.gz nextcloud-server-de8c15e1a46e33a20af1bad97a8cf27fced84539.zip | |
Merge pull request #14764 from owncloud/shared-etag-propagate
Propagate etags across shared storages
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/connector/sabre/file.php | 1 | ||||
| -rw-r--r-- | tests/lib/files/etagtest.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php index 3fe5c2751f1..ee9c20fd9cb 100644 --- a/tests/lib/connector/sabre/file.php +++ b/tests/lib/connector/sabre/file.php @@ -52,7 +52,6 @@ class File extends \Test\TestCase { $view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath', 'resolvePath'), array()); $view->expects($this->any()) ->method('resolvePath') - ->with('') ->will($this->returnValue(array($storage, ''))); $view->expects($this->any()) ->method('getRelativePath') diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php index 055927652bc..c3d364d6800 100644 --- a/tests/lib/files/etagtest.php +++ b/tests/lib/files/etagtest.php @@ -25,7 +25,9 @@ class EtagTest extends \Test\TestCase { parent::setUp(); \OC_Hook::clear('OC_Filesystem', 'setup'); - \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); + $application = new \OCA\Files_Sharing\AppInfo\Application(); + $application->registerMountProviders(); + $application->setupPropagation(); \OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); \OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); |