Skip to content

[stable17] Add support for Talk sidebar in public share pages #2238

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 21 commits into from
Sep 27, 2019
Merged

[stable17] Add support for Talk sidebar in public share pages #2238

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1e37164
Add support for public shares to file rooms
danxuliu Jul 18, 2018
37f2f71
Add integration tests for files shared by link
danxuliu Aug 14, 2019
d1a3e69
Add integration tests for self-joined users in files shared by link
danxuliu Aug 14, 2019
f2e7806
Add self-joined users and guests to the candidate mentions in file rooms
danxuliu Aug 14, 2019
fc6d2a4
Add integration tests for mentions in a file shared by link
danxuliu Aug 14, 2019
6b04fb7
Fix avatar container height during calls
danxuliu Sep 16, 2019
094b9b3
Add support for Talk sidebar in public share pages
danxuliu Aug 15, 2019
18a1037
Add basic acceptance tests for the Talk sidebar in the public share page
danxuliu Aug 16, 2019
465059d
Add acceptance tests for Talk sidebar in public share page to Drone
danxuliu Aug 16, 2019
1521c5f
Add acceptance tests for registered users in the public share page
danxuliu Aug 16, 2019
f6ac589
Add acceptance tests for mentioning users in the Files app
danxuliu Aug 16, 2019
b8be6a7
Add acceptance tests for mentions in the public share page
danxuliu Aug 16, 2019
3361774
Add acceptance tests for chats in a file shared by link
danxuliu Aug 16, 2019
bab3557
Add acceptance tests for chats in a file shared by link with a password
danxuliu Aug 16, 2019
744de08
Correctly check if the share has a password and if it was entered cor…
nickvergessen Aug 16, 2019
2f58186
Add integration tests for getting the room for link share with password
danxuliu Aug 17, 2019
6b0a0dc
Do not add system message for self joined users to file rooms
danxuliu Aug 19, 2019
ad37a86
Add integration tests for the "user_added" system message
danxuliu Aug 19, 2019
2f12dc9
Add wrapper around "OC.getCurrentUser()" to be able to override the user
danxuliu Sep 25, 2019
4b9a47a
Override the current user when getting the room for a public share page
danxuliu Sep 25, 2019
68797f3
Fix guest avatars in public share page
danxuliu Sep 25, 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
Prev Previous commit
Next Next commit
Add integration tests for mentions in a file shared by link 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Sep 27, 2019
commit fc6d2a41545766f1455d1a8f90ba393a644c71ef
196 changes: 196 additions & 0 deletions tests/integration/features/chat/mentions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,3 +321,199 @@ Feature: chat/mentions
And user "participant2" is not participant of room "file welcome.txt room"
When user "participant1" sends message "hi @participant2" to room "file welcome.txt room" with 201
Then user "participant2" is participant of room "file welcome.txt room"



Scenario: get mentions in a room for a file shared by link with no other joined participant
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
When user "participant1" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant2" is not participant of room "file last share room"
Then user "participant1" gets the following candidate mentions in room "file last share room" for "" with 200
| id | label | source |
| all | welcome.txt | calls |
| participant2 | participant2-displayname | users |
And user "participant2" gets the following candidate mentions in room "file last share room" for "" with 404
And user "participant3" gets the following candidate mentions in room "file last share room" for "" with 404
And user "guest" gets the following candidate mentions in room "file last share room" for "" with 404

Scenario: get mentions in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" with user "participant4" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
When user "participant1" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
And user "participant2" joins room "file last share room" with 200
# Users without access to a file shared by link need to log in (so further
# requests keep the same session) and get the room (so the share token is
# stored in the session) to be able to join it.
And user "participant3" logs in
And user "participant3" gets the room for last share with 200
And user "participant3" joins room "file last share room" with 200
# Guests need to get the room (so the share token is stored in the session)
# to be able to join it.
And user "guest" gets the room for last share with 200
And user "guest" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant2" is participant of room "file last share room"
And user "participant3" is participant of room "file last share room"
And user "guest" is participant of room "file last share room"
Then user "participant1" gets the following candidate mentions in room "file last share room" for "" with 200
| id | label | source |
| all | welcome.txt | calls |
| participant2 | participant2-displayname | users |
| participant4 | participant4-displayname | users |
| participant3 | participant3-displayname | users |
| GUEST_ID | Guest | guests |
And user "participant2" gets the following candidate mentions in room "file last share room" for "" with 200
| id | label | source |
| all | welcome.txt | calls |
| participant1 | participant1-displayname | users |
| participant4 | participant4-displayname | users |
| participant3 | participant3-displayname | users |
| GUEST_ID | Guest | guests |
# Self-joined users can not mention users with access to the file that have
# not joined the room.
And user "participant3" gets the following candidate mentions in room "file last share room" for "" with 200
| id | label | source |
| all | welcome.txt | calls |
| participant1 | participant1-displayname | users |
| participant2 | participant2-displayname | users |
| GUEST_ID | Guest | guests |
# Guests can not mention users with access to the file that have not joined
# the room.
And user "guest" gets the following candidate mentions in room "file last share room" for "" with 200
| id | label | source |
| all | welcome.txt | calls |
| participant1 | participant1-displayname | users |
| participant2 | participant2-displayname | users |
| participant3 | participant3-displayname | users |

Scenario: get matched mentions in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" with user "participant4" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
When user "participant2" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
And user "participant2" joins room "file last share room" with 200
# Users without access to a file shared by link need to log in (so further
# requests keep the same session) and get the room (so the share token is
# stored in the session) to be able to join it.
And user "participant3" logs in
And user "participant3" gets the room for last share with 200
And user "participant3" joins room "file last share room" with 200
# Guests need to get the room (so the share token is stored in the session)
# to be able to join it.
And user "guest" gets the room for last share with 200
And user "guest" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant2" is participant of room "file last share room"
And user "participant3" is participant of room "file last share room"
And user "guest" is participant of room "file last share room"
Then user "participant1" gets the following candidate mentions in room "file last share room" for "part" with 200
| id | label | source |
| participant2 | participant2-displayname | users |
| participant4 | participant4-displayname | users |
| participant3 | participant3-displayname | users |
And user "participant2" gets the following candidate mentions in room "file last share room" for "part" with 200
| id | label | source |
| participant1 | participant1-displayname | users |
| participant4 | participant4-displayname | users |
| participant3 | participant3-displayname | users |
# Self-joined users can not mention users with access to the file that have
# not joined the room.
And user "participant3" gets the following candidate mentions in room "file last share room" for "part" with 200
| id | label | source |
| participant1 | participant1-displayname | users |
| participant2 | participant2-displayname | users |
# Guests can not mention users with access to the file that have not joined
# the room.
And user "guest" gets the following candidate mentions in room "file last share room" for "part" with 200
| id | label | source |
| participant1 | participant1-displayname | users |
| participant2 | participant2-displayname | users |
| participant3 | participant3-displayname | users |

Scenario: get unmatched mentions in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" with user "participant4" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
When user "participant2" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
And user "participant2" joins room "file last share room" with 200
# Users without access to a file shared by link need to log in (so further
# requests keep the same session) and get the room (so the share token is
# stored in the session) to be able to join it.
And user "participant3" logs in
And user "participant3" gets the room for last share with 200
And user "participant3" joins room "file last share room" with 200
# Guests need to get the room (so the share token is stored in the session)
# to be able to join it.
And user "guest" gets the room for last share with 200
And user "guest" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant2" is participant of room "file last share room"
And user "participant3" is participant of room "file last share room"
And user "guest" is participant of room "file last share room"
Then user "participant1" gets the following candidate mentions in room "file last share room" for "unknown" with 200
And user "participant2" gets the following candidate mentions in room "file last share room" for "unknown" with 200
And user "participant3" gets the following candidate mentions in room "file last share room" for "unknown" with 200
And user "guest" gets the following candidate mentions in room "file last share room" for "unknown" with 200

Scenario: get mentions in a room for a file shared by link with a participant without access to the file and not joined
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
When user "participant2" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
And user "participant2" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant2" is participant of room "file last share room"
Then user "participant3" gets the following candidate mentions in room "file last share room" for "" with 404
And user "guest" gets the following candidate mentions in room "file last share room" for "" with 404

Scenario: mention a participant with access to the file but not joined in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
And user "participant1" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant2" is not participant of room "file last share room"
When user "participant1" sends message "hi @participant2" to room "file last share room" with 201
Then user "participant2" is participant of room "file last share room"

Scenario: mention a participant with access to the file but not joined by self-joined user and guest in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
# Users without access to a file shared by link need to log in (so further
# requests keep the same session) and get the room (so the share token is
# stored in the session) to be able to join it.
And user "participant3" logs in
And user "participant3" gets the room for last share with 200
And user "participant3" joins room "file last share room" with 200
# Guests need to get the room (so the share token is stored in the session)
# to be able to join it.
And user "guest" gets the room for last share with 200
And user "guest" joins room "file last share room" with 200
And user "participant2" is not participant of room "file last share room"
When user "participant3" sends message "hi @participant2" to room "file last share room" with 201
And user "guest" sends message "hello @participant2" to room "file last share room" with 201
Then user "participant2" is not participant of room "file last share room"

Scenario: mention a participant without access to the file but joined in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
And user "participant1" shares "welcome.txt" by link with OCS 100
And user "participant1" gets the room for last share with 200
And user "participant1" joins room "file last share room" with 200
# Users without access to a file shared by link need to log in (so further
# requests keep the same session) and get the room (so the share token is
# stored in the session) to be able to join it.
And user "participant3" logs in
And user "participant3" gets the room for last share with 200
And user "participant3" joins room "file last share room" with 200
And user "participant1" is participant of room "file last share room"
And user "participant3" is participant of room "file last share room"
When user "participant1" sends message "hi @participant3" to room "file last share room" with 201
And user "participant3" leaves room "file last share room" with 200
Then user "participant3" is not participant of room "file last share room"