Skip to content

Allow to mention groupfolder users in file chats #4246

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 7 commits into from
Apr 13, 2021
Merged

Allow to mention groupfolder users in file chats #4246

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73be7be
Allow to mention groupfolder users in file chats
nickvergessen Sep 29, 2020
75f09c8
Also allow accessing file conversations when access is possible via e…
nickvergessen Sep 30, 2020
6f071f6
Remove unused methods
nickvergessen Sep 30, 2020
2adfdd9
Check if the file is accessible by someone else before allowing to ch…
nickvergessen Sep 30, 2020
2acd348
Only take shares on the file directly into account
nickvergessen Sep 30, 2020
850ccf2
Fix integration tests
nickvergessen Dec 18, 2020
f212cb2
Adjust integration tests to the new expectations
nickvergessen Apr 9, 2021
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
Prev Previous commit
Adjust integration tests to the new expectations 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Apr 13, 2021
commit f212cb2244c6de42dd475f6418af65ea975d8b7c
18 changes: 9 additions & 9 deletions tests/integration/features/conversation/files.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ Feature: conversation/files
When user "participant3" joins room "file test/renamed.txt room" with 200 (v4)
Then user "participant3" is participant of room "file test/renamed.txt room" (v4)

Scenario: owner of a no longer shared file can not join its room
Scenario: owner of a no longer shared file can join its room
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant2" accepts last share
And user "participant2" gets the room for path "welcome (2).txt" with 200 (v1)
And user "participant1" deletes last share
When user "participant1" joins room "file welcome (2).txt room" with 404 (v4)
Then user "participant1" is not participant of room "file welcome (2).txt room" (v4)
When user "participant1" joins room "file welcome (2).txt room" with 200 (v4)
Then user "participant1" is participant of room "file welcome (2).txt room" (v4)

Scenario: user no longer with access to a file can not join its room
Given user "participant1" shares "welcome.txt" with user "participant3" with OCS 100
Expand Down Expand Up @@ -447,7 +447,7 @@ Feature: conversation/files
# Participants are removed from the room for a no longer shared file once they
# try to join the room again, but not when the file is unshared.

Scenario: owner is not participant of room for file no longer shared
Scenario: owner is participant of room for file no longer shared
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant2" accepts last share
And user "participant1" gets the room for path "welcome.txt" with 200 (v1)
Expand All @@ -456,8 +456,8 @@ Feature: conversation/files
And user "participant1" is participant of room "file welcome.txt room" (v4)
When user "participant1" deletes last share
Then user "participant1" is participant of room "file welcome.txt room" (v4)
And user "participant1" joins room "file welcome.txt room" with 404 (v4)
And user "participant1" is not participant of room "file welcome.txt room" (v4)
And user "participant1" joins room "file welcome.txt room" with 200 (v4)
And user "participant1" is participant of room "file welcome.txt room" (v4)

Scenario: user is not participant of room for file no longer with access to it
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
Expand All @@ -473,16 +473,16 @@ Feature: conversation/files



Scenario: owner is not participant of room for file no longer shared by link
Scenario: owner is participant of room for file no longer shared by link
Given user "participant1" shares "welcome.txt" by link with OCS 100
And user "participant1" gets the room for last share with 200 (v1)
And user "participant1" joins room "file last share room" with 200 (v4)
And user "participant1" leaves room "file last share room" with 200 (v4)
And user "participant1" is participant of room "file last share room" (v4)
When user "participant1" deletes last share
Then user "participant1" is participant of room "file last share room" (v4)
And user "participant1" joins room "file last share room" with 404 (v4)
And user "participant1" is not participant of room "file last share room" (v4)
And user "participant1" joins room "file last share room" with 200 (v4)
And user "participant1" is participant of room "file last share room" (v4)

Scenario: user is participant of room for file no longer shared by link but with access to it
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
Expand Down