diff --git a/tests/acceptance/bootstrap/WebDav.php b/tests/acceptance/bootstrap/WebDav.php index ed5d496260..b8ac7e5cdc 100644 --- a/tests/acceptance/bootstrap/WebDav.php +++ b/tests/acceptance/bootstrap/WebDav.php @@ -1573,7 +1573,6 @@ trait WebDav { // /some-folder%20with%20spaces/sub-folder // So we need both $elementToRequest and $expectedElement $expectedElement = $this->encodePath($elementToRequest); - $responseXmlObject = $this->listFolderAndReturnResponseXml( $user, $elementToRequest, @@ -1585,7 +1584,7 @@ trait WebDav { $element = $responseXmlObject->xpath( "//d:response/d:href" ); - + // check the first element because the requested resource will always be the first one if (!$expectedToBeListed && isset($element[0]) ) { Assert::fail( @@ -1600,7 +1599,6 @@ trait WebDav { ); } } - } } } diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature index 8b844df040..a4c0589b61 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature @@ -58,9 +58,9 @@ Feature: share resources where the sharee receives the share in multiple ways Then the OCS status code should be "" And the HTTP status code should be "200" And user "Brian" should see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | - | /Shares/CHILD | + | /Shares/CHILD | | /Shares/CHILD/child.txt | Examples: | ocs-api-version | ocs-status-code | diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature index 26e1a72768..14befaef59 100644 --- a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature +++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature @@ -426,10 +426,10 @@ Feature: sharing Then the OCS status code should be "" And the HTTP status code should be "200" And user "Brian" should see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | And user "Carol" should see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | Examples: | ocs-api-version | ocs-status-code | diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature index 18c67571b0..0778d8877b 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature @@ -36,11 +36,11 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /textfile0.txt | But user "Brian" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the pending state @@ -48,11 +48,11 @@ Feature: accept/decline shares coming from internal users | /PARENT/ | | /textfile0.txt | And user "Carol" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /textfile0.txt | But user "Carol" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Carol" that these shares are in the pending state @@ -68,11 +68,11 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /textfile0.txt | But user "Brian" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the pending state @@ -120,10 +120,10 @@ Feature: accept/decline shares coming from internal users | share_with_displayname | %displayname% | | mail_send | 0 | And user "Brian" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /textfile0.txt | - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the accepted state @@ -170,11 +170,11 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /textfile0.txt | But user "Brian" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the declined state @@ -204,7 +204,7 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the declined state @@ -253,7 +253,7 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Carol" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Carol" that these shares are in the pending state @@ -261,7 +261,7 @@ Feature: accept/decline shares coming from internal users | /PARENT/ | | /textfile0.txt | But user "Brian" should see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | | /Shares/textfile0.txt | And the sharing API should report to user "Brian" that these shares are in the accepted state @@ -293,7 +293,7 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Carol" should see the following elements - | /Shares/shared/Brian | + | /Shares/shared/Brian | | /Shares/shared (1)/Alice | And the sharing API should report to user "Carol" that these shares are in the accepted state | path | @@ -384,11 +384,11 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /FOLDER | - | /PARENT | - | /Shares/PARENT | + | /FOLDER | + | /PARENT | + | /Shares/PARENT | | /Shares/PARENT/abc.txt | - | /Shares/FOLDER | + | /Shares/FOLDER | | /Shares/FOLDER/abc.txt | And user "Brian" should not see the following elements | /FOLDER/abc.txt | @@ -413,20 +413,20 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /FOLDER | - | /PARENT | - | /Shares/PARENT | - | /Shares/FOLDER | + | /FOLDER | + | /PARENT | + | /Shares/PARENT | + | /Shares/FOLDER | | /Shares/PARENT/abc.txt | | /Shares/FOLDER/abc.txt | And user "Brian" should not see the following elements | /FOLDER/abc.txt | | /PARENT/abc.txt | And user "Carol" should see the following elements - | /FOLDER | - | /PARENT | - | /Shares/PARENT | - | /Shares/FOLDER | + | /FOLDER | + | /PARENT | + | /Shares/PARENT | + | /Shares/FOLDER | | /Shares/PARENT/abc.txt | | /Shares/FOLDER/abc.txt | And user "Carol" should not see the following elements @@ -472,19 +472,19 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /PARENT | + | /PARENT | | /textfile0.txt | But user "Brian" should not see the following elements | /Shares/textfile0.txt | - | /Shares/PARENT | + | /Shares/PARENT | When user "Brian" accepts share "/textfile0.txt" offered by user "Alice" using the sharing API And user "Brian" accepts share "/PARENT" offered by user "Alice" using the sharing API Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /PARENT | + | /PARENT | | /textfile0.txt | - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/textfile0.txt | @@ -526,7 +526,7 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "David" should see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/abc.txt | And user "David" should not see the following elements | /PARENT (2) | @@ -600,9 +600,9 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /PARENT | - | /Shares/PARENT | - | /Shares/PaRent | + | /PARENT | + | /Shares/PARENT | + | /Shares/PaRent | | /Shares/PARENT.txt | And the content of file "/Shares/PARENT/parent.txt" for user "Brian" should be "subfile, from alice to grp2" And the content of file "/Shares/PaRent/parent.txt" for user "Brian" should be "subfile, from alice to grp2" @@ -620,10 +620,10 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Brian" should see the following elements - | /PARENT | - | /Shares/PARENT | - | /Shares/PARENT (1) | - | /Shares/PaRent | + | /PARENT | + | /Shares/PARENT | + | /Shares/PARENT (1) | + | /Shares/PaRent | | /Shares/PARENT.txt | | /Shares/PARENT (1).txt | | /Shares/parent.txt | @@ -664,9 +664,9 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Carol" should see the following elements - | /PARENT | - | /Shares/PARENT | - | /Shares/PaRent | + | /PARENT | + | /Shares/PARENT | + | /Shares/PaRent | | /Shares/PARENT.txt | And the content of file "/Shares/PARENT/parent.txt" for user "Carol" should be "subfile, from alice to grp1" And the content of file "/Shares/PARENT.txt" for user "Carol" should be "from alice to grp1" @@ -683,10 +683,10 @@ Feature: accept/decline shares coming from internal users Then the OCS status code of responses on all endpoints should be "100" And the HTTP status code of responses on all endpoints should be "200" And user "Carol" should see the following elements - | /PARENT | - | /Shares/PARENT | - | /Shares/PARENT (1) | - | /Shares/PaRent | + | /PARENT | + | /Shares/PARENT | + | /Shares/PARENT (1) | + | /Shares/PaRent | | /Shares/PARENT.txt | | /Shares/PARENT (1).txt | | /Shares/parent.txt | diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature index 6eec4fe5e7..dce6474d6f 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature @@ -154,10 +154,10 @@ Feature: sharing When the administrator removes user "Carol" from group "group0" using the provisioning API Then the HTTP status code should be "204" And user "Brian" should see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | But user "Carol" should not see the following elements - | /Shares/PARENT | + | /Shares/PARENT | | /Shares/PARENT/parent.txt | @smokeTest @issue-1226 @issue-1270 @issue-1271 @issue-1231 diff --git a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature index 5ef9e1c11e..4452a2767f 100644 --- a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature +++ b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature @@ -24,8 +24,8 @@ Feature: restore deleted files/folders And as "Alice" the file with original path "/textfile0.txt" should not exist in the trashbin And the content of file "/textfile0.txt" for user "Alice" should be "file to delete" And user "Alice" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /PARENT/parent.txt | | /textfile0.txt | | /textfile1.txt | @@ -187,10 +187,10 @@ Feature: restore deleted files/folders And the content of file "" for user "Alice" should be "file original content" Examples: | dav-path-version | file-name | - | spaces | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ | - | new | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ | - | spaces | strängé नेपाली file | - | new | strängé नेपाली file | + | spaces | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ | + | new | 😛 😜 🐱 🐭 ⌚️ ♀️ 🚴‍♂️ | + | spaces | strängé नेपाली file | + | new | strängé नेपाली file | | spaces | sample,1.txt | | new | sample,1.txt | @@ -416,8 +416,8 @@ Feature: restore deleted files/folders Then the HTTP status code should be "409" And as "Alice" the file with original path "/parent_folder/sub/parent.txt" should exist in the trashbin And user "Alice" should not see the following elements - | /parent_folder | - | /parent_folder/sub | + | /parent_folder | + | /parent_folder/sub | | /parent_folder/sub/parent.txt | Examples: | dav-path-version | @@ -440,8 +440,8 @@ Feature: restore deleted files/folders And as "Alice" the file with original path "/parent_folder/sub/parent.txt" should not exist in the trashbin And the content of file "/parent_folder/sub/parent.txt" for user "Alice" should be "parent text" And user "Alice" should see the following elements - | /parent_folder | - | /parent_folder/sub | + | /parent_folder | + | /parent_folder/sub | | /parent_folder/sub/parent.txt | Examples: | dav-path-version | @@ -459,8 +459,8 @@ Feature: restore deleted files/folders Then the HTTP status code should be "400" And as "Alice" the file with original path "/parent_folder/sub/parent.txt" should exist in the trashbin And user "Alice" should not see the following elements - | /parent_folder | - | /parent_folder/sub | + | /parent_folder | + | /parent_folder/sub | | /parent_folder/sub/parent.txt | Examples: | dav-path-version | diff --git a/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature index 577979745d..1aa85f2738 100644 --- a/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature +++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature @@ -19,12 +19,12 @@ Feature: delete folder contents When user "Alice" deletes everything from folder "/FOLDER/" using the WebDAV API Then the HTTP status code should be "204" And user "Alice" should see the following elements - | /FOLDER | - | /PARENT | + | /FOLDER | + | /PARENT | | /textfile0.txt | | /textfile1.txt | And user "Alice" should not see the following elements - | /FOLDER/SUBFOLDER | + | /FOLDER/SUBFOLDER | | /FOLDER/fileToDelete.txt | | /FOLDER/SUBFOLDER/testfile0.txt | Examples: