summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-29 22:02:23 +0100
committerGitHub <noreply@github.com>2018-11-29 22:02:23 +0100
commit331f3b2652c39cde05a8cdd774c5a290a0aac8bc (patch)
treeff280f37298a3aeb8cb0103895a9f214fcf66484 /tests
parenta915594b03757a9e7f3f0a266dd29003ac6dd7d0 (diff)
parentdf32b7a40e794a9fc388e033d7d9cf26362d5132 (diff)
downloadnextcloud-server-331f3b2652c39cde05a8cdd774c5a290a0aac8bc.tar.gz
nextcloud-server-331f3b2652c39cde05a8cdd774c5a290a0aac8bc.zip
Merge pull request #12691 from nextcloud/storage-no-encryption-interface
Add interface to allow storages from opting out of encryption
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/Encryption/EncryptionWrapperTest.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php
index d20efa8821f..cff48d2cd6d 100644
--- a/tests/lib/Encryption/EncryptionWrapperTest.php
+++ b/tests/lib/Encryption/EncryptionWrapperTest.php
@@ -92,13 +92,7 @@ class EncryptionWrapperTest extends TestCase {
[true, ['OCA\Files_Trashbin\Storage']],
// Do not wrap shared storages
- [false, ['OCA\Files_Sharing\SharedStorage']],
- [false, ['OCA\Files_Sharing\External\Storage']],
- [false, ['OC\Files\Storage\OwnCloud']],
- [false, ['OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage']],
- [false, ['OCA\Files_Sharing\SharedStorage', 'OC\Files\Storage\OwnCloud']],
- [false, ['OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']],
- [false, ['OCA\Files_Sharing\SharedStorage', 'OCA\Files_Sharing\External\Storage', 'OC\Files\Storage\OwnCloud']],
+ [false, [Storage\IDisableEncryptionStorage::class]],
];
}