diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-26 17:12:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 17:12:57 +0100 |
| commit | 612e875f609a89a09a2d0fa7c017f6f4f5b0e97d (patch) | |
| tree | fdc15c30deb098fda96ae053f6ac00f8b06f5571 /build | |
| parent | 4154a565366cc805d51a3d6a8b8c11cde62f29f9 (diff) | |
| parent | aeb7503febbae7213a234e7b5b35d3291f78e2f8 (diff) | |
| download | nextcloud-server-612e875f609a89a09a2d0fa7c017f6f4f5b0e97d.tar.gz nextcloud-server-612e875f609a89a09a2d0fa7c017f6f4f5b0e97d.zip | |
Merge pull request #8355 from nextcloud/fix-comments-num-index
Fix comments (and systemtags) when involving users with numerical ids
Diffstat (limited to 'build')
| -rw-r--r-- | build/integration/features/comments.feature | 12 | ||||
| -rw-r--r-- | build/integration/features/tags.feature | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/build/integration/features/comments.feature b/build/integration/features/comments.feature index 135bb016527..0ee11bc9873 100644 --- a/build/integration/features/comments.feature +++ b/build/integration/features/comments.feature @@ -16,21 +16,21 @@ Feature: comments Scenario: Creating a comment on a shared file belonging to another user Given user "user0" exists - Given user "user1" exists + Given user "12345" exists Given User "user0" uploads file "data/textfile.txt" to "/myFileToComment.txt" Given As "user0" sending "POST" to "/apps/files_sharing/api/v1/shares" with | path | myFileToComment.txt | - | shareWith | user1 | + | shareWith | 12345 | | shareType | 0 | - When "user1" posts a comment with content "A comment from another user" on the file named "/myFileToComment.txt" it should return "201" - Then As "user1" load all the comments of the file named "/myFileToComment.txt" it should return "207" + When "12345" posts a comment with content "A comment from another user" on the file named "/myFileToComment.txt" it should return "201" + Then As "12345" load all the comments of the file named "/myFileToComment.txt" it should return "207" And the response should contain a property "oc:parentId" with value "0" And the response should contain a property "oc:childrenCount" with value "0" And the response should contain a property "oc:verb" with value "comment" And the response should contain a property "oc:actorType" with value "users" And the response should contain a property "oc:objectType" with value "files" And the response should contain a property "oc:message" with value "A comment from another user" - And the response should contain a property "oc:actorDisplayName" with value "user1" + And the response should contain a property "oc:actorDisplayName" with value "12345" And the response should contain only "1" comments Scenario: Creating a comment on a non-shared file belonging to another user @@ -206,4 +206,4 @@ Feature: comments And the response should contain a property "oc:message" with value "My first comment" And the response should contain a property "oc:actorDisplayName" with value "user1" And the response should contain only "1" comments - Then As "user0" edit the last created comment and set text to "My edited comment" it should return "403"
\ No newline at end of file + Then As "user0" edit the last created comment and set text to "My edited comment" it should return "403" diff --git a/build/integration/features/tags.feature b/build/integration/features/tags.feature index 0c6cd06f9f9..3ef7ccb38b0 100644 --- a/build/integration/features/tags.feature +++ b/build/integration/features/tags.feature @@ -114,14 +114,14 @@ Feature: tags Scenario: Assigning a normal tag to a file shared by someone else as regular user should work Given user "user0" exists - Given user "user1" exists + Given user "12345" exists Given "admin" creates a "normal" tag with name "MySuperAwesomeTagName" Given user "user0" uploads file "data/textfile.txt" to "/myFileToTag.txt" Given As "user0" sending "POST" to "/apps/files_sharing/api/v1/shares" with | path | myFileToTag.txt | - | shareWith | user1 | + | shareWith | 12345 | | shareType | 0 | - When "user1" adds the tag "MySuperAwesomeTagName" to "/myFileToTag.txt" shared by "user0" + When "12345" adds the tag "MySuperAwesomeTagName" to "/myFileToTag.txt" shared by "user0" Then The response should have a status code "201" And "/myFileToTag.txt" shared by "user0" has the following tags |MySuperAwesomeTagName| |