summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-29 22:01:14 +0100
committerGitHub <noreply@github.com>2018-11-29 22:01:14 +0100
commit96450a9e9b7bb80f5883e9f1ca95d093cc33100b (patch)
tree6c0e77de4b1eab3cba1cb6908e2cb6e68e418e0c /tests
parent82fedb16a010890697854ed2375e5893f077915c (diff)
parent7cdc04a7932f45889fb72b3e29dd12708f1d091c (diff)
downloadnextcloud-server-96450a9e9b7bb80f5883e9f1ca95d093cc33100b.tar.gz
nextcloud-server-96450a9e9b7bb80f5883e9f1ca95d093cc33100b.zip
Merge pull request #12692 from nextcloud/storage-no-encryption-interface-15
[15] 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]],
];
}