diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2017-02-16 11:47:16 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-23 00:02:48 -0600 |
| commit | 89c42a76c34aba7dd4c23649f97495283cf023ba (patch) | |
| tree | 4252d22cb431a00f8dcda5d52e0080d1fdff16d8 /build/integration | |
| parent | 39ac804899197069b40384afdc40966e22658eca (diff) | |
| download | nextcloud-server-89c42a76c34aba7dd4c23649f97495283cf023ba.tar.gz nextcloud-server-89c42a76c34aba7dd4c23649f97495283cf023ba.zip | |
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
The CacheWrapper will properly forward the call to the wrapped cache.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'build/integration')
| -rw-r--r-- | build/integration/features/external-storage.feature | 21 | ||||
| -rw-r--r-- | build/integration/features/sharing-v1.feature | 10 |
2 files changed, 30 insertions, 1 deletions
diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature index da085d9e983..09ffdb29803 100644 --- a/build/integration/features/external-storage.feature +++ b/build/integration/features/external-storage.feature @@ -23,7 +23,6 @@ Feature: external-storage | token | A_TOKEN | | mimetype | httpd/unix-directory | - @local_storage Scenario: Shares dont overwrite external storages Given user "user0" exists And user "user1" exists @@ -40,3 +39,23 @@ Feature: external-storage And folder "/test" of user "user1" is shared with user "user0" And As an "user0" Then as "user0" the file "/test/textfile1.txt" does not exist + + Scenario: Move a file into storage works + Given user "user0" exists + And user "user1" exists + And As an "user0" + And user "user0" created a folder "/local_storage/foo1" + When User "user0" moved file "/textfile0.txt" to "/local_storage/foo1/textfile0.txt" + Then as "user1" the file "/local_storage/foo1/textfile0.txt" exists + And as "user0" the file "/local_storage/foo1/textfile0.txt" exists + + Scenario: Move a file out of the storage works + Given user "user0" exists + And user "user1" exists + And As an "user0" + And user "user0" created a folder "/local_storage/foo2" + And User "user0" moved file "/textfile0.txt" to "/local_storage/foo2/textfile0.txt" + When User "user1" moved file "/local_storage/foo2/textfile0.txt" to "/local.txt" + Then as "user1" the file "/local_storage/foo2/textfile0.txt" does not exist + And as "user0" the file "/local_storage/foo2/textfile0.txt" does not exist + And as "user1" the file "/local.txt" exists diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature index 4ce32654ba4..74579f63527 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/features/sharing-v1.feature @@ -988,3 +988,13 @@ Feature: sharing And Updating last share with | publicUpload | true | Then the OCS status code should be "404" + + Scenario: moving a file into a share as recipient + Given As an "admin" + And user "user0" exists + And user "user1" exists + And user "user0" created a folder "/shared" + And folder "/shared" of user "user0" is shared with user "user1" + When User "user1" moved file "/textfile0.txt" to "/shared/shared_file.txt" + Then as "user1" the file "/shared/shared_file.txt" exists + And as "user0" the file "/shared/shared_file.txt" exists |