From 314eff4e94a8c58e8579350bb6b7facef262d6eb Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 16 Oct 2020 12:53:16 +0545 Subject: [PATCH] Reformat gherkin tables --- .../apiAuthOcs-ocsDELETEAuth.feature | 24 +++++++++---------- .../apiAuthOcs-ocsPOSTAuth.feature | 24 +++++++++---------- .../apiAuthOcs-ocsPUTAuth.feature | 20 ++++++++-------- ...-createShareWithInvalidPermissions.feature | 14 +++++------ ...piShareManagementBasic-createShare.feature | 24 +++++++++---------- ...ePublicLink1-createPublicLinkShare.feature | 2 +- .../apiShareUpdate-updateShare.feature | 24 +++++++++---------- .../apiWebdavUpload1-uploadFile.feature | 6 ++--- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature index 5aa7c63dec..a5286bb944 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature @@ -22,37 +22,37 @@ Feature: auth Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users/%username% | - | /ocs/v1.php/cloud/users/%username%/subadmins | + | endpoint | + | /ocs/v1.php/cloud/users/%username% | + | /ocs/v1.php/cloud/users/%username%/subadmins | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "998" Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username% | + | endpoint | + | /ocs/v2.php/cloud/users/%username% | Then the HTTP status code of responses on all endpoints should be "404" And the OCS status code of responses on all endpoints should be "998" Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users/%username%/groups | + | endpoint | + | /ocs/v1.php/cloud/users/%username%/groups | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "996" Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username%/groups | + | endpoint | + | /ocs/v2.php/cloud/users/%username%/groups | Then the HTTP status code of responses on all endpoints should be "500" And the OCS status code of responses on all endpoints should be "996" Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username% | - | /ocs/v2.php/cloud/users/%username%/subadmins | + | endpoint | + | /ocs/v2.php/cloud/users/%username% | + | /ocs/v2.php/cloud/users/%username%/subadmins | Then the HTTP status code of responses on all endpoints should be "404" And the OCS status code of responses on all endpoints should be "998" diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature index 661fdbd53d..a05de81628 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature @@ -31,13 +31,13 @@ Feature: auth # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send POST requests to OCS endpoints as normal user with wrong password When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users | + | endpoint | + | /ocs/v1.php/cloud/users | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "400" When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users | + | endpoint | + | /ocs/v2.php/cloud/users | Then the HTTP status code of responses on all endpoints should be "400" And the OCS status code of responses on all endpoints should be "400" @@ -45,13 +45,13 @@ Feature: auth # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send POST requests to OCS endpoints as normal user with wrong password When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users/%username%/groups | + | endpoint | + | /ocs/v1.php/cloud/users/%username%/groups | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "400" When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username%/groups | + | endpoint | + | /ocs/v2.php/cloud/users/%username%/groups | Then the HTTP status code of responses on all endpoints should be "400" And the OCS status code of responses on all endpoints should be "400" @@ -59,12 +59,12 @@ Feature: auth # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send POST requests to OCS endpoints as normal user with wrong password When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users/%username%/subadmins | + | endpoint | + | /ocs/v1.php/cloud/users/%username%/subadmins | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "998" When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username%/subadmins | + | endpoint | + | /ocs/v2.php/cloud/users/%username%/subadmins | Then the HTTP status code of responses on all endpoints should be "404" And the OCS status code of responses on all endpoints should be "998" diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature index 1f76bdc689..d603acb693 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature @@ -17,13 +17,13 @@ Feature: auth # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send PUT request to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users/%username% | + | endpoint | + | /ocs/v1.php/cloud/users/%username% | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "103" When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username% | + | endpoint | + | /ocs/v2.php/cloud/users/%username% | Then the HTTP status code of responses on all endpoints should be "400" And the OCS status code of responses on all endpoints should be "103" @@ -32,15 +32,15 @@ Feature: auth # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send PUT request to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v1.php/cloud/users/%username%/disable | - | /ocs/v1.php/cloud/users/%username%/enable | + | endpoint | + | /ocs/v1.php/cloud/users/%username%/disable | + | /ocs/v1.php/cloud/users/%username%/enable | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "998" When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" - | endpoint | - | /ocs/v2.php/cloud/users/%username%/disable | - | /ocs/v2.php/cloud/users/%username%/enable | + | endpoint | + | /ocs/v2.php/cloud/users/%username%/disable | + | /ocs/v2.php/cloud/users/%username%/enable | Then the HTTP status code of responses on all endpoints should be "404" And the OCS status code of responses on all endpoints should be "998" diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature index 8d08de8b99..a2ef0a901c 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature @@ -21,8 +21,8 @@ Feature: cannot share resources with invalid permissions And as "Brian" entry "textfile0.txt" should not exist Examples: | ocs_api_version | ocs_status_code | eos_status_code | http_status_code_ocs | http_status_code_eos | - | 1 | 100 | 996 | 200 | 500 | - | 2 | 200 | 996 | 200 | 500 | + | 1 | 100 | 996 | 200 | 500 | + | 2 | 200 | 996 | 200 | 500 | @issue-ocis-reva-45 @issue-ocis-reva-243 # after fixing all issues delete this Scenario and use the one from oC10 core @@ -38,8 +38,8 @@ Feature: cannot share resources with invalid permissions And the HTTP status code should be "" or "" And as "Brian" entry "textfile0.txt" should not exist Examples: - | ocs_api_version | eos_status_code | ocs_status_code | http_status_code_ocs | http_status_code_eos | permissions | - | 1 | 100 | 996 | 200 | 500 | delete | - | 2 | 200 | 996 | 200 | 500 | delete | - | 1 | 100 | 996 | 200 | 500 | create,delete | - | 2 | 200 | 996 | 200 | 500 | create,delete | + | ocs_api_version | eos_status_code | ocs_status_code | http_status_code_ocs | http_status_code_eos | permissions | + | 1 | 100 | 996 | 200 | 500 | delete | + | 2 | 200 | 996 | 200 | 500 | delete | + | 1 | 100 | 996 | 200 | 500 | create,delete | + | 2 | 200 | 996 | 200 | 500 | create,delete | diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature index 772938353d..66160280ec 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature @@ -53,8 +53,8 @@ Feature: sharing And as "Brian" file "randomfile.txt" should not exist Examples: | ocs_api_version | http_status_code_ocs | http_status_code_eos | - | 1 | 200 | 500 | - | 2 | 200 | 500 | + | 1 | 200 | 500 | + | 2 | 200 | 500 | @skipOnOcis-OC-Storage @skipOnOcis-OCIS-Storage @issue-ocis-reva-301 @issue-ocis-reva-302 # after fixing all issues delete this Scenario and use the one from oC10 core @@ -66,16 +66,16 @@ Feature: sharing Then the OCS status code should be "" And the HTTP status code should be "200" And the fields of the last response to user "Alice" sharing with user "Brian" should include - | share_with | %username% | - | file_target | /FOLDER | - | path | /FOLDER | - | permissions | all | - | uid_owner | %username% | - | displayname_owner | | - | item_type | folder | - | mimetype | httpd/unix-directory | - | storage_id | ANY_VALUE | - | share_type | user | + | share_with | %username% | + | file_target | /FOLDER | + | path | /FOLDER | + | permissions | all | + | uid_owner | %username% | + | displayname_owner | | + | item_type | folder | + | mimetype | httpd/unix-directory | + | storage_id | ANY_VALUE | + | share_type | user | And the fields of the last response should not include | share_with_displayname | %displayname% | Examples: diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature index ad3848bf44..ee2c4cf43e 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature @@ -23,7 +23,7 @@ Feature: create a public link share Given user "Alice" has created folder "testFolder" When user "Alice" uploads file with content "uploaded content for file name ending with a dot" to "testFolder/file.txt" using the WebDAV API And user "Alice" has created a public link share with settings - | path | /testFolder | + | path | /testFolder | | permissions | read,update,create,delete | And the public uploads file "file.txt" to the last shared folder with mtime "Thu, 08 Aug 2019 04:18:13 GMT" using the new public WebDAV API Then as "Alice" file "/testFolder/file.txt" should exist diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature index 38b85dbbe2..9eb1112845 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature @@ -59,18 +59,18 @@ Feature: sharing When user "Brian" moves folder "/Alice-folder/folder2" to "/Carol-folder/folder2" using the WebDAV API And user "Carol" gets the info of the last share using the sharing API Then the fields of the last response to user "Carol" sharing with user "Brian" should include - | id | A_STRING | - | item_type | folder | - | item_source | A_STRING | - | share_type | user | - | file_source | A_STRING | - | file_target | /Carol-folder | - | permissions | all | - | stime | A_NUMBER | - | storage | A_STRING | - | mail_send | 0 | - | uid_owner | %username% | - | mimetype | httpd/unix-directory | + | id | A_STRING | + | item_type | folder | + | item_source | A_STRING | + | share_type | user | + | file_source | A_STRING | + | file_target | /Carol-folder | + | permissions | all | + | stime | A_NUMBER | + | storage | A_STRING | + | mail_send | 0 | + | uid_owner | %username% | + | mimetype | httpd/unix-directory | And as "Alice" folder "/Alice-folder/folder2" should exist And as "Carol" folder "/Carol-folder/folder2" should not exist diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature index e570c2acd6..b4b78ebc5d 100644 --- a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature +++ b/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature @@ -15,9 +15,9 @@ Feature: upload file When user "Alice" uploads file with content "uploaded content" to using the WebDAV API Then the content of file for user "Alice" should be "" Examples: - | dav_version | file_name | - | old | "file ?2.txt" | - | new | "file ?2.txt" | + | dav_version | file_name | + | old | "file ?2.txt" | + | new | "file ?2.txt" | @skipOnOcis-OC-Storage @issue-product-127 @skipOnOcis-OCIS-Storage # this scenario passes/fails intermittently on OC storage, so do not run it in CI