diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 12:48:19 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 12:48:19 +0200 |
| commit | dcb5f0046192c242d274e301c7e462651dcdebe0 (patch) | |
| tree | a42975dc5602338dd5c361eb3e7907931a8eca36 /build | |
| parent | ea327cdea1172768816bb79cf920e74e7585348a (diff) | |
| parent | 907c90165a4d147f8608705df15c6d0d9dbdb335 (diff) | |
| download | nextcloud-server-dcb5f0046192c242d274e301c7e462651dcdebe0.tar.gz nextcloud-server-dcb5f0046192c242d274e301c7e462651dcdebe0.zip | |
Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync
Diffstat (limited to 'build')
| -rw-r--r-- | build/integration/features/sharing-v1.feature | 13 | ||||
| -rw-r--r-- | build/integration/features/webdav-related.feature | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature index ba535e83aab..56399eefdb0 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/features/sharing-v1.feature @@ -566,3 +566,16 @@ Feature: sharing | path | welcome.txt | | shareType | 3 | Then share ids should match + + Scenario: unique target names for incomming shares + Given user "user0" exists + And user "user1" exists + And user "user2" exists + And user "user0" created a folder "/foo" + And user "user1" created a folder "/foo" + When file "/foo" of user "user0" is shared with user "user2" + And file "/foo" of user "user1" is shared with user "user2" + Then user "user2" should see following elements + | /foo/ | + | /foo%20(2)/ | + diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature index 9231fbebbe9..c6d2919db8d 100644 --- a/build/integration/features/webdav-related.feature +++ b/build/integration/features/webdav-related.feature @@ -73,7 +73,7 @@ Feature: webdav-related And As an "admin" When Downloading file "/welcome.txt" Then The following headers should be set - |Content-Disposition|attachment| + |Content-Disposition|attachment; filename*=UTF-8''welcome.txt; filename="welcome.txt"| |Content-Security-Policy|default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src * data: blob:; font-src 'self' data:; media-src *; connect-src *| |X-Content-Type-Options |nosniff| |X-Download-Options|noopen| @@ -88,7 +88,7 @@ Feature: webdav-related And As an "admin" When Downloading file "/welcome.txt" Then The following headers should be set - |Content-Disposition|attachment| + |Content-Disposition|attachment; filename*=UTF-8''welcome.txt; filename="welcome.txt"| |Content-Security-Policy|default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src * data: blob:; font-src 'self' data:; media-src *; connect-src *| |X-Content-Type-Options |nosniff| |X-Download-Options|noopen| |