diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-28 21:56:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 21:56:44 +0200 |
| commit | 4821c00ea81797fcb5a99c31105ad42be598f113 (patch) | |
| tree | 6b56762ce35894d849ffc139dfddb3c19e1fc97e /build | |
| parent | e26f138fc596492da88b8a0d57749f5703e1d100 (diff) | |
| parent | ae3016959e6cbcadcd5169fa9e35a332abcc4495 (diff) | |
| download | nextcloud-server-4821c00ea81797fcb5a99c31105ad42be598f113.tar.gz nextcloud-server-4821c00ea81797fcb5a99c31105ad42be598f113.zip | |
Merge pull request #4004 from nextcloud/backport-27172
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
Diffstat (limited to 'build')
| -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 |