Skip to content

Project green for stable15 #1695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 3 commits into from
Apr 10, 2019
Merged

Project green for stable15 #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f792eb5
Greeeeeeeeeeeeeen
nickvergessen Mar 14, 2019
80397db
Greeeeeeeeeeeeeen
nickvergessen Mar 14, 2019
f535c6f
More backport
nickvergessen Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/integration/features/sharing/create.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ Feature: create
| storage_id | home::participant2 |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |
| share_with_displayname | Private conversation |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant1 |
Expand Down
199 changes: 0 additions & 199 deletions tests/integration/features/sharing/move.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,60 +49,6 @@ Feature: move
| share_with | group room |
| share_with_displayname | Group room |



# When an own share is moved into a received shared folder the ownership of
# the share is handed over to the folder owner.
Scenario: move share to received shared folder from a user in the room
Given user "participant1" creates room "group room"
| roomType | 2 |
And user "participant1" renames room "group room" to "Group room" with 200
And user "participant1" adds "participant2" to room "group room" with 200
And user "participant1" adds "participant3" to room "group room" with 200
And user "participant3" creates folder "/test"
And user "participant3" shares "/test" with user "participant1" with OCS 100
And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
When user "participant1" moves file "/welcome.txt" to "/test/renamed.txt" with 201
Then user "participant1" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| uid_file_owner | participant3 |
| displayname_file_owner | participant3-displayname |
| path | /test/renamed.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/test |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant2" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| uid_file_owner | participant3 |
| displayname_file_owner | participant3-displayname |
| path | /welcome (2).txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/welcome (2).txt |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| uid_file_owner | participant3 |
| displayname_file_owner | participant3-displayname |
| path | /test/renamed.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | home::participant3 |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |

Scenario: move share to received shared folder from a user not in the room
Given user "participant1" creates room "group room"
| roomType | 2 |
Expand Down Expand Up @@ -153,61 +99,6 @@ Feature: move
| share_with | group room |
| share_with_displayname | Group room |

Scenario: move share to received shared folder which is also a received shared folder
Given user "participant1" creates room "group room"
| roomType | 2 |
And user "participant1" renames room "group room" to "Group room" with 200
And user "participant1" adds "participant2" to room "group room" with 200
And user "participant3" creates folder "/test"
And user "participant3" shares "/test" with user "participant4" with OCS 100
And user "participant4" shares "/test" with user "participant1" with OCS 100
And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
When user "participant1" moves file "/welcome.txt" to "/test/renamed.txt" with 201
Then user "participant1" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| uid_file_owner | participant3 |
| displayname_file_owner | participant3-displayname |
| path | /test/renamed.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/test |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant2" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| uid_file_owner | participant3 |
| displayname_file_owner | participant3-displayname |
| path | /welcome (2).txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/welcome (2).txt |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| uid_file_owner | participant3 |
| displayname_file_owner | participant3-displayname |
| path | /test/renamed.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | home::participant3 |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant4" gets last share
Then the OCS status code should be "404"
And the HTTP status code should be "200"



Scenario: move received share to another folder
Given user "participant1" creates room "group room"
| roomType | 2 |
Expand Down Expand Up @@ -266,93 +157,3 @@ Feature: move
And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
When user "participant3" moves file "/welcome (2).txt" to "/test/renamed.txt"
Then the HTTP status code should be "403"

# Received shares can be moved into other received shares, though. However,
# they are moved back to the default share folder.
Scenario: move received share to received shared folder from a user in the room
Given user "participant1" creates room "group room"
| roomType | 2 |
And user "participant1" renames room "group room" to "Group room" with 200
And user "participant1" adds "participant2" to room "group room" with 200
And user "participant1" adds "participant3" to room "group room" with 200
And user "participant3" creates folder "/test"
And user "participant3" shares "/test" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
When user "participant2" moves file "/welcome (2).txt" to "/test/renamed.txt"
Then user "participant1" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| path | /welcome.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | home::participant1 |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant2" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| path | /renamed.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/renamed.txt |
| file_target | /renamed.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| path | /welcome (2).txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/welcome (2).txt |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |

Scenario: move received share to received shared folder from a user not in the room
Given user "participant1" creates room "group room"
| roomType | 2 |
And user "participant1" renames room "group room" to "Group room" with 200
And user "participant1" adds "participant2" to room "group room" with 200
And user "participant1" adds "participant3" to room "group room" with 200
And user "participant4" creates folder "/test"
And user "participant4" shares "/test" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
When user "participant2" moves file "/welcome (2).txt" to "/test/renamed.txt"
Then user "participant1" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| path | /welcome.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | home::participant1 |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant2" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| path | /renamed.txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/renamed.txt |
| file_target | /renamed.txt |
| share_with | group room |
| share_with_displayname | Group room |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant1 |
| displayname_owner | participant1-displayname |
| path | /welcome (2).txt |
| item_type | file |
| mimetype | text/plain |
| storage_id | shared::/welcome (2).txt |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |
2 changes: 1 addition & 1 deletion tests/integration/features/sharing/transfer-ownership.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Feature: transfer-ownership
| storage_id | home::participant2 |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
| share_with_displayname | Private conversation |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant2 |
Expand Down