Граф коммитов

422 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 1e49d1247b
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:55:30 +01:00
Joas Schilling 6f19e9ddfd
Allow to start conversations with circles
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-20 10:52:52 +01:00
Joas Schilling 5b72a671bc
Merge pull request #2502 from nextcloud/bugfix/noid/typed-events
Typed events
2019-12-06 11:52:16 +01:00
Daniel Calviño Sánchez 0132199e81 Bump default Docker image used in helper script to run integration tests
Support for PHP 7.1 was dropped in server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-12-06 06:44:47 +01:00
Joas Schilling eed4a254b8
Add a dedicated method to the model
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:37:26 +01:00
Joas Schilling 3496c7faaa
Add a flag to messages if they can be replied to
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:37:26 +01:00
Joas Schilling 81db771748
Add constants for event names and use pattern
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:36:59 +01:00
Joas Schilling 0e1d2b39b9
Typed events for Talk
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:36:59 +01:00
Joas Schilling 59978d8e8b
Fix sharing integration tests and loading shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-04 08:35:41 +01:00
Joas Schilling 324a30dd5b
Fix warnings and errors with phpunit 8
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-28 14:54:16 +01:00
Joas Schilling 80357681e6
Update master php testing versions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-28 14:38:27 +01:00
dependabot-preview[bot] 6ec55bcb58
Bump behat/behat from 3.3.1 to 3.5.0 in /tests/integration
Bumps [behat/behat](https://github.com/Behat/Behat) from 3.3.1 to 3.5.0.
- [Release notes](https://github.com/Behat/Behat/releases)
- [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Behat/Behat/compare/v3.3.1...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 17:49:39 +00:00
Ivan Sein 5175da0707 Update lobby acceptance tests
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2019-10-07 13:24:19 +02:00
Joas Schilling 31c616023d
Merge pull request #2275 from nextcloud/adjust-integration-test-to-changes-in-access-to-shares-in-server
Adjust integration test to changes in access to shares in server
2019-10-07 09:18:07 +02:00
Daniel Calviño Sánchez 9fc305259b Do not run tests when PHP files of other types of tests are modified
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-07 01:33:53 +02:00
Daniel Calviño Sánchez 9aee59cd1c Adjust integration test to changes in access to shares in server
Now a user with access to a file is able to get any of its shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-07 01:07:04 +02:00
Joas Schilling 5a8f8fd6a6
Fix "MessageTooLongException" when mentioning someone in a long comment
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-04 11:03:03 +02:00
Daniel Calviño Sánchez b493086b48
Merge pull request #2245 from nextcloud/bugfix/2237/fix-minor-php-issues
Fix minor php issues
2019-10-02 10:54:47 +02:00
Joas Schilling 733da0c4c2
Correctly set the unread counter when readding a user to a one-to-one conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-01 09:54:40 +02:00
Joas Schilling 7314559199
More IShare::TYPE_* fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-01 09:25:19 +02:00
Daniel Calviño Sánchez 6f8ac51d10 Add integration tests for the "user_added" system message
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez b77d4b2b84 Add integration tests for getting the room for link share with password
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Joas Schilling 41a1556957 Correctly check if the share has a password and if it was entered correctly.
This prevents joining the room for a file shared by link and protected
by password if the password has not been entered yet.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez b4a2907146 Add acceptance tests for chats in a file shared by link with a password
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez 7f731bda54 Add acceptance tests for chats in a file shared by link
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez c03ab40882 Add acceptance tests for mentions in the public share page
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez cd17e48f08 Add acceptance tests for mentioning users in the Files app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez aaa8b84c31 Add acceptance tests for registered users in the public share page
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:28 +02:00
Daniel Calviño Sánchez 255ac5dc86 Add basic acceptance tests for the Talk sidebar in the public share page
The "I see that the current page is the shared link I wrote down" step
is defined in the server but needs to be extended in Talk to also set
(in the tests) the Talk sidebar as the ancestor of the chat view.

In order to extend a step the whole Context that it belongs to must be
extended. Note, however, that the step in the child Context should not
include any "Given", "When" or "Then" annotation, as it would clash with
the step defined in the parent Context (the "Override" annotation is
simply informative, as it is ignored by Behat); as long as the method
has the same signature the step from the child Context will be used
instead if the step from the parent Context.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:54:27 +02:00
Daniel Calviño Sánchez 6bb86a4d6b Add integration tests for mentions in a file shared by link
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:45:01 +02:00
Daniel Calviño Sánchez 3d894598ae Add integration tests for self-joined users in files shared by link
Self-joined users and guests can join the room for a file if the file is
shared by link. In order to check that, however, the share token should
have been previously stored in the session, as the room is linked to the
file id and users without direct access to a file can not find out if
the file is shared by link or not. Therefore self-joined users and
guests must get the room for the share (which stores the share token in
the session) before being able to join the room.

Besides that, in the case of self-joined users they must be logged in
too. Otherwise the session is regenerated on each new request, which
prevents getting the share token stored in a previous request.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:45:01 +02:00
Daniel Calviño Sánchez 8de6a11bc7 Add integration tests for files shared by link
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:45:01 +02:00
Daniel Calviño Sánchez edc54ea5d5 Add support for public shares to file rooms
Until now file rooms were available only to users with direct access to
the file. Now file rooms are available to any user or guest too if the
link is publicly shared (with a link share, for example).

Public shares are identified by a share token instead of a file id, so a
new endpoint, which is a counterpart of FilesController but for share
tokens, was added. The file room, however, is still associated to the
file id like before.

When checking if a participant can join a room if the current user is a
user without direct access to the file or a guest it is not even
possible to know if the file id belongs to a publicly shared file. Due
to this when the room is got for a share token the share token is stored
in the session and then used in following requests when checking whether
the participant can join a room or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-26 10:45:01 +02:00
Joas Schilling 5da475f4c0
Populate the canStartCall value and add a capability
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-19 14:55:59 +02:00
Joas Schilling 256c9fc587
Merge pull request #2197 from nextcloud/bugfix/2194/unify-avatar-handling-of-guests
Unify the handling of the guest avatars
2019-09-19 14:46:57 +02:00
Joas Schilling 5649e4c0ab
Unify system messages with mentions of guest users in ordinary messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-19 11:05:06 +02:00
Daniel Calviño Sánchez f2fd53a341 Unify lobby with mobile clients
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-09-13 18:47:46 +02:00
Joas Schilling d4fc586f1a
Bye Spreed, hello Talk!
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-05 14:29:09 +02:00
Joas Schilling 88357647d3
Update the master version and test app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-05 12:02:47 +02:00
Joas Schilling e0b99298b4
Merge pull request #2148 from nextcloud/bugfix/2141/use-new-richobject-type-guest
Use the new rich object type guest
2019-09-04 15:01:30 +02:00
Joas Schilling 4f64ed7d4a
Use the new rich object type guest
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-02 15:09:11 +02:00
Joas Schilling 67c81e772f
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-30 14:41:23 +02:00
Joas Schilling a0c47ca4e0
Users are not automatically participants anymore when asking for a file conversation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-29 09:23:17 +02:00
Joas Schilling 6f1e4bef32
Merge pull request #1926 from nextcloud/feature/382/lobby
 Lobby
2019-08-28 15:12:44 +02:00
Joas Schilling b2e30c4708
Merge pull request #2102 from nextcloud/bugfix/2088/support-file-calls-in-groupfolders
Support file calls in groupfolders
2019-08-28 14:19:57 +02:00
Joas Schilling 16c035962a
Add a unit test and fix an issue with folders
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-28 10:51:54 +02:00
Daniel Calviño Sánchez 22be1a9310 Add acceptance tests for joining a room with a lobby
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-08-28 10:41:07 +02:00
Daniel Calviño Sánchez 8745fd19fe Rename lobby constants
The lobby constants were named from the point of view of the webinary
(open to all participants, open to moderators only), but from the point
of view of the lobby it is the opposite (no lobby, lobby for non
moderators).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-08-28 10:28:30 +02:00
Joas Schilling 3eec1b09dc Use a different status code for lobby blocked requests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-28 10:28:06 +02:00
Joas Schilling ac1c1520b6 Add capability
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-28 10:28:06 +02:00