From 1374ef4400bf4d5834c9b6a9f7b1fcad78d49773 Mon Sep 17 00:00:00 2001 From: paurakhsharma Date: Fri, 2 Nov 2018 11:59:20 +0545 Subject: [PATCH] Remove skip on fixed issue and update issue number on others --- .../apiProvisioning-v2/addGroup.feature | 5 ++- .../apiProvisioning-v2/addToGroup.feature | 5 ++- .../apiProvisioning-v2/createSubAdmin.feature | 5 ++- .../apiProvisioning-v2/deleteGroup.feature | 10 +++-- .../apiProvisioning-v2/deleteUser.feature | 5 ++- .../apiProvisioning-v2/disableApp.feature | 6 ++- .../apiProvisioning-v2/disableUser.feature | 15 ++++--- .../apiProvisioning-v2/enableApp.feature | 6 ++- .../apiProvisioning-v2/enableUser.feature | 5 ++- .../apiProvisioning-v2/getGroup.feature | 10 +++-- .../apiProvisioning-v2/getSubAdmins.feature | 10 +++-- .../apiProvisioning-v2/getUserGroups.feature | 5 ++- .../apiProvisioning-v2/getUsers.feature | 5 ++- .../removeFromGroup.feature | 5 ++- .../apiProvisioning-v2/removeSubAdmin.feature | 8 ++-- .../apiShareManagement/createShare.feature | 5 ++- .../uploadFileUsingNewChunking.feature | 1 - .../apiWebdavProperties/moveFileAsync.feature | 39 ++++++++----------- .../features/cliProvisioning/editUser.feature | 2 +- .../resetPasswordUsingEmail.feature | 2 +- 20 files changed, 85 insertions(+), 69 deletions(-) diff --git a/tests/acceptance/features/apiProvisioning-v2/addGroup.feature b/tests/acceptance/features/apiProvisioning-v2/addGroup.feature index a06e054e1eb3..285801fbd81f 100644 --- a/tests/acceptance/features/apiProvisioning-v2/addGroup.feature +++ b/tests/acceptance/features/apiProvisioning-v2/addGroup.feature @@ -75,12 +75,13 @@ Feature: add groups And the HTTP status code should be "400" And group "new-group" should exist - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to create a group Given user "brand-new-user" has been created When user "brand-new-user" sends HTTP method "POST" to OCS API endpoint "/cloud/groups" with body | groupid | new-group | - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And group "new-group" should not exist diff --git a/tests/acceptance/features/apiProvisioning-v2/addToGroup.feature b/tests/acceptance/features/apiProvisioning-v2/addToGroup.feature index 8151f52853b8..fa4ba9f89ff9 100644 --- a/tests/acceptance/features/apiProvisioning-v2/addToGroup.feature +++ b/tests/acceptance/features/apiProvisioning-v2/addToGroup.feature @@ -62,12 +62,13 @@ Feature: add users to group | var/../etc | using slash-dot-dot | | priv/subadmins/1 | Subadmins mentioned not at the end | - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to add himself to a group Given user "brand-new-user" has been created When user "brand-new-user" sends HTTP method "POST" to OCS API endpoint "/cloud/users/brand-new-user/groups" with body | groupid | new-group | - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the API should not return any data diff --git a/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature b/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature index 15873a7c3425..8bf3cb6af319 100644 --- a/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature +++ b/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature @@ -34,7 +34,7 @@ Feature: create a subadmin Then the OCS status code should be "400" And the HTTP status code should be "400" - @skip @issue-31276 + @issue-31276 Scenario: subadmin of a group tries to make another user subadmin of their group Given user "subadmin" has been created And user "brand-new-user" has been created @@ -44,7 +44,8 @@ Feature: create a subadmin | groupid | new-group | When user "subadmin" sends HTTP method "POST" to OCS API endpoint "/cloud/users/brand-new-user/subadmins" with body | groupid | new-group | - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the user "not-user" should not be the subadmin of the group "new-group" \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/deleteGroup.feature b/tests/acceptance/features/apiProvisioning-v2/deleteGroup.feature index d569af28ba5e..d570cb30b15e 100644 --- a/tests/acceptance/features/apiProvisioning-v2/deleteGroup.feature +++ b/tests/acceptance/features/apiProvisioning-v2/deleteGroup.feature @@ -59,22 +59,24 @@ Feature: delete groups | var/../etc | using slash-dot-dot | | priv/subadmins/1 | Subadmins mentioned not at the end | - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to delete the group Given user "brand-new-user" has been created And group "new-group" has been created And user "brand-new-user" has been added to group "new-group" When user "brand-new-user" sends HTTP method "DELETE" to OCS API endpoint "/cloud/groups/new-group" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And group "new-group" should exist - @skip @issue-31276 + @issue-31276 Scenario: subadmin of the group tries to delete the group Given user "subadmin" has been created And group "new-group" has been created And user "subadmin" has been made a subadmin of group "new-group" When user "subamin" sends HTTP method "DELETE" to OCS API endpoint "/cloud/groups/new-group" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And group "new-group" should exist \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature b/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature index 55bce1531c1e..9beb5abc3e64 100644 --- a/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature +++ b/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature @@ -27,11 +27,12 @@ Feature: delete users And the HTTP status code should be "200" And user "brand-new-user" should not exist - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to delete a user Given user "user1" has been created And user "user2" has been created When user "user1" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/user2" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And user "user2" should exist \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/disableApp.feature b/tests/acceptance/features/apiProvisioning-v2/disableApp.feature index 4bdf7310fb0f..3c0ebad35771 100644 --- a/tests/acceptance/features/apiProvisioning-v2/disableApp.feature +++ b/tests/acceptance/features/apiProvisioning-v2/disableApp.feature @@ -15,7 +15,7 @@ Feature: disable an app And the HTTP status code should be "200" And app "comments" should be disabled - @skip @issue-31276 + @issue-31276 Scenario: subadmin tries to disable an app Given user "subadmin" has been created And group "newgroup" has been created @@ -23,14 +23,16 @@ Feature: disable an app And the app "comments" has been enabled When user "subadmin" disables the app "comments" Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And app "comments" should be enabled - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to disable an app Given user "newuser" has been created And the app "comments" has been enabled When user "newuser" disables the app "comments" Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And app "comments" should be enabled diff --git a/tests/acceptance/features/apiProvisioning-v2/disableUser.feature b/tests/acceptance/features/apiProvisioning-v2/disableUser.feature index c48832839dec..7dc9a18a5b0e 100644 --- a/tests/acceptance/features/apiProvisioning-v2/disableUser.feature +++ b/tests/acceptance/features/apiProvisioning-v2/disableUser.feature @@ -28,7 +28,7 @@ Feature: disable user And the HTTP status code should be "200" And user "user1" should be disabled - @skip @issue-31276 + @issue-31276 Scenario: Subadmin should not be able to disable an user not in their group Given user "subadmin" has been created And user "user1" has been created @@ -38,11 +38,12 @@ Feature: disable user And user "user1" has been added to group "another-group" And user "subadmin" has been made a subadmin of group "new-group" When user "subadmin" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/user1/disable" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And user "user1" should be enabled - @skip @issue-31276 + @issue-31276 Scenario: Subadmins should not be able to disable users that have admin permissions in their group Given user "another-admin" has been created And user "subadmin" has been created @@ -52,7 +53,8 @@ Feature: disable user And user "another-admin" has been added to group "new-group" And user "subadmin" has been made a subadmin of group "new-group" When user "subadmin" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/another-admin/disable" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And user "another-admin" should be enabled @@ -83,12 +85,13 @@ Feature: disable user And the HTTP status code should be "400" And user "another-admin" should be enabled - @skip @issue-31276 + @issue-31276 Scenario: disable an user with a regular user Given user "user1" has been created And user "user2" has been created When user "user1" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/user2/disable" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And user "user2" should be enabled diff --git a/tests/acceptance/features/apiProvisioning-v2/enableApp.feature b/tests/acceptance/features/apiProvisioning-v2/enableApp.feature index bf318d9f42f7..b24d0dada63c 100644 --- a/tests/acceptance/features/apiProvisioning-v2/enableApp.feature +++ b/tests/acceptance/features/apiProvisioning-v2/enableApp.feature @@ -15,7 +15,7 @@ Feature: enable an app And the HTTP status code should be "200" And app "comments" should be enabled - @skip @issue-31276 + @issue-31276 Scenario: subadmin tries to enable an app Given user "subadmin" has been created And group "newgroup" has been created @@ -23,14 +23,16 @@ Feature: enable an app And the app "comments" has been disabled When user "subadmin" enables the app "comments" Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And app "comments" should be disabled - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to enable an app Given user "newuser" has been created And the app "comments" has been disabled When user "newuser" enables the app "comments" Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And app "comments" should be disabled \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/enableUser.feature b/tests/acceptance/features/apiProvisioning-v2/enableUser.feature index 8bf273f10596..5f5cf7eac71e 100644 --- a/tests/acceptance/features/apiProvisioning-v2/enableUser.feature +++ b/tests/acceptance/features/apiProvisioning-v2/enableUser.feature @@ -44,13 +44,14 @@ Feature: enable user When user "another-admin" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/another-admin/enable" Then user "another-admin" should be disabled - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to enable other user Given user "user1" has been created And user "user2" has been created And user "user2" has been disabled When user "user1" sends HTTP method "PUT" to OCS API endpoint "/cloud/users/user2/enable" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And user "user2" should be disabled diff --git a/tests/acceptance/features/apiProvisioning-v2/getGroup.feature b/tests/acceptance/features/apiProvisioning-v2/getGroup.feature index f676528cdc3f..40e5e21da05d 100644 --- a/tests/acceptance/features/apiProvisioning-v2/getGroup.feature +++ b/tests/acceptance/features/apiProvisioning-v2/getGroup.feature @@ -44,20 +44,22 @@ Feature: get group | user1 | | user2 | - @skip @issue-31276 + @issue-31276 Scenario: subadmin tries to get users in a group he is not responsible for Given user "subadmin" has been created And group "new-group" has been created And group "another-group" has been created And user "subadmin" has been made a subadmin of group "new-group" When user "subadmin" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/another-group" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to get users in his group Given user "newuser" has been created And group "new-group" has been created When user "newuser" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/new-group" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature b/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature index ab9cca80ee56..dea8c7f29441 100644 --- a/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature +++ b/tests/acceptance/features/apiProvisioning-v2/getSubAdmins.feature @@ -26,7 +26,7 @@ Feature: get subadmins And the HTTP status code should be "400" And the API should not return any data - @skip @issue-31276 + @issue-31276 Scenario: subadmin tries to get other subadmins of the same group Given user "subadmin" has been created And user "newsubadmin" has been created @@ -34,17 +34,19 @@ Feature: get subadmins And user "subadmin" has been made a subadmin of group "new-group" And user "newsubadmin" has been made a subadmin of group "new-group" When user "subadmin" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/new-group/subadmins" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the API should not return any data - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to get the subadmins of the group Given user "newuser" has been created And user "subadmin" has been created And group "new-group" has been created And user "subadmin" has been made a subadmin of group "new-group" When user "newuser" sends HTTP method "GET" to OCS API endpoint "/cloud/groups/new-group/subadmins" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the API should not return any data \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/getUserGroups.feature b/tests/acceptance/features/apiProvisioning-v2/getUserGroups.feature index a4bda305c419..32efac0c20c3 100644 --- a/tests/acceptance/features/apiProvisioning-v2/getUserGroups.feature +++ b/tests/acceptance/features/apiProvisioning-v2/getUserGroups.feature @@ -80,13 +80,14 @@ Feature: get user groups And the OCS status code should be "200" And the HTTP status code should be "200" - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to get the groups of another user Given user "newuser" has been created And user "anotheruser" has been created And group "newgroup" has been created And user "newuser" has been added to group "newgroup" When user "anotheruser" sends HTTP method "GET" to OCS API endpoint "/cloud/users/newuser/groups" - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the API should not return any data \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/getUsers.feature b/tests/acceptance/features/apiProvisioning-v2/getUsers.feature index a54fd94cc1ad..d7ac40e5d79c 100644 --- a/tests/acceptance/features/apiProvisioning-v2/getUsers.feature +++ b/tests/acceptance/features/apiProvisioning-v2/getUsers.feature @@ -30,11 +30,12 @@ Feature: get users And the OCS status code should be "200" And the HTTP status code should be "200" - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to get other users Given user "normaluser" has been created And user "newuser" has been created When user "normaluser" sends HTTP method "GET" to OCS API endpoint "/cloud/users" - And the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the API should not return any data \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/removeFromGroup.feature b/tests/acceptance/features/apiProvisioning-v2/removeFromGroup.feature index 3be16f11d244..587b7d2ff682 100644 --- a/tests/acceptance/features/apiProvisioning-v2/removeFromGroup.feature +++ b/tests/acceptance/features/apiProvisioning-v2/removeFromGroup.feature @@ -103,7 +103,7 @@ Feature: remove a user from a group And the HTTP status code should be "403" And user "brand-new-user" should belong to group "new-group" - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to remove the user in his group Given user "newuser" has been created And user "anotheruser" has been created @@ -112,6 +112,7 @@ Feature: remove a user from a group And user "anotheruser" has been added to group "new-group" When user "newuser" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/anotheruser/groups" with body | groupid | new-group | - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And user "anotheruser" should belong to group "new-group" \ No newline at end of file diff --git a/tests/acceptance/features/apiProvisioning-v2/removeSubAdmin.feature b/tests/acceptance/features/apiProvisioning-v2/removeSubAdmin.feature index 0ac1079e247e..e30338162f73 100644 --- a/tests/acceptance/features/apiProvisioning-v2/removeSubAdmin.feature +++ b/tests/acceptance/features/apiProvisioning-v2/removeSubAdmin.feature @@ -18,7 +18,7 @@ Feature: remove subadmin And the HTTP status code should be "200" And the user "brand-new-user" should not be the subadmin of the group "new-group" - @skip @issue-31276 + @issue-31276 Scenario: subadmin tries to remove other subadmin in the group Given user "subadmin" has been created And group "new-group" has been created @@ -27,11 +27,12 @@ Feature: remove subadmin And user "newsubadmin" has been made a subadmin of group "new-group" When user "subadmin" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/newsubadmin/subadmins" with body | groupid | new-group | - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the user "newsubadmin" should be the subadmin of the group "new-group" - @skip @issue-31276 + @issue-31276 Scenario: normal user tries to remove subadmin in the group Given user "subadmin" has been created And user "newuser" has been created @@ -41,5 +42,6 @@ Feature: remove subadmin When user "newuser" sends HTTP method "DELETE" to OCS API endpoint "/cloud/users/subadmin/subadmins" with body | groupid | new-group | Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" And the user "subadmin" should be the subadmin of the group "new-group" \ No newline at end of file diff --git a/tests/acceptance/features/apiShareManagement/createShare.feature b/tests/acceptance/features/apiShareManagement/createShare.feature index 015a7f1dfc08..64ff6ea6b40f 100644 --- a/tests/acceptance/features/apiShareManagement/createShare.feature +++ b/tests/acceptance/features/apiShareManagement/createShare.feature @@ -143,7 +143,7 @@ Feature: sharing | ocs_api_version | ocs_status_code | | 1 | 997 | - @skip @issue-32068 + @issue-32068 Scenario: Creating a new share with a disabled user Given using OCS API version "2" And user "user1" has been created @@ -152,7 +152,8 @@ Feature: sharing | path | welcome.txt | | shareWith | user1 | | shareType | 0 | - Then the OCS status code should be "401" + Then the OCS status code should be "997" + #And the OCS status code should be "401" And the HTTP status code should be "401" @public_link_share-feature-required diff --git a/tests/acceptance/features/apiWebdavOperations/uploadFileUsingNewChunking.feature b/tests/acceptance/features/apiWebdavOperations/uploadFileUsingNewChunking.feature index 1e346602b108..9317490f0f19 100644 --- a/tests/acceptance/features/apiWebdavOperations/uploadFileUsingNewChunking.feature +++ b/tests/acceptance/features/apiWebdavOperations/uploadFileUsingNewChunking.feature @@ -138,7 +138,6 @@ Feature: upload file using new chunking | TIÄFÜ | #this test should be integrated into the previous Scenario after fixing the issue - @skip @issue-29599 Scenario: Upload a file called "0" using new chunking When user "user0" creates a new chunking upload with id "chunking-42" using the WebDAV API And user "user0" uploads new chunk file "1" with "AAAAA" to id "chunking-42" using the WebDAV API diff --git a/tests/acceptance/features/apiWebdavProperties/moveFileAsync.feature b/tests/acceptance/features/apiWebdavProperties/moveFileAsync.feature index 8652cf1580ef..3899acf13804 100644 --- a/tests/acceptance/features/apiWebdavProperties/moveFileAsync.feature +++ b/tests/acceptance/features/apiWebdavProperties/moveFileAsync.feature @@ -15,8 +15,9 @@ Feature: move (rename) file And the following headers should match these regular expressions | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | And the oc job status values of last request for user "user0" should match these regular expressions - | status | /^finished$/ | - | fileId | /^[0-9a-z]{20,}$/ | + | status | /^finished$/ | + | fileId | /^[0-9a-z]{20,}$/ | + | ETag | /^"[0-9a-f]{32}"$/ | And the downloaded content when downloading file "/FOLDER/" for user "user0" with range "bytes=0-6" should be "Welcome" And user "user0" should not see the following elements | /welcome.txt | @@ -28,26 +29,15 @@ Feature: move (rename) file | file #2.txt | | file ?2.txt | - @skip @issue-32593 #ToDo: after fixing the issue add the ETag check to all tests where it makes sense and delete this test - Scenario: Moving a file - When user "user0" moves file "/welcome.txt" asynchronously to "/FOLDER/welcome.txt" using the WebDAV API - Then the HTTP status code should be "202" - And the following headers should match these regular expressions - | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | - And the oc job status values of last request for user "user0" should match these regular expressions - | ETag | /^[0-9a-f]{32}$/ | - And the downloaded content when downloading file "/FOLDER/welcome.txt" for user "user0" with range "bytes=0-6" should be "Welcome" - And user "user0" should not see the following elements - | /welcome.txt | - Scenario: Moving and overwriting a file When user "user0" moves file "/welcome.txt" asynchronously to "/textfile0.txt" using the WebDAV API Then the HTTP status code should be "202" And the following headers should match these regular expressions | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | And the oc job status values of last request for user "user0" should match these regular expressions - | status | /^finished$/ | - | fileId | /^[0-9a-z]{20,}$/ | + | status | /^finished$/ | + | fileId | /^[0-9a-z]{20,}$/ | + | ETag | /^"[0-9a-f]{32}"$/ | And the downloaded content when downloading file "/textfile0.txt" for user "user0" with range "bytes=0-6" should be "Welcome" And user "user0" should not see the following elements | /welcome.txt | @@ -58,8 +48,9 @@ Feature: move (rename) file And the following headers should match these regular expressions | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | And the oc job status values of last request for user "user0" should match these regular expressions - | status | /^finished$/ | - | fileId | /^[0-9a-z]{20,}$/ | + | status | /^finished$/ | + | fileId | /^[0-9a-z]{20,}$/ | + | ETag | /^"[0-9a-f]{32}"$/ | And the content of file "/TextFile0.txt" for user "user0" should be "ownCloud test text file 0" plus end-of-line And user "user0" should not see the following elements | /textfile0.txt | @@ -70,8 +61,9 @@ Feature: move (rename) file And the following headers should match these regular expressions | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | And the oc job status values of last request for user "user0" should match these regular expressions - | status | /^finished$/ | - | fileId | /^[0-9a-z]{20,}$/ | + | status | /^finished$/ | + | fileId | /^[0-9a-z]{20,}$/ | + | ETag | /^"[0-9a-f]{32}"$/ | And the content of file "/textfile0.txt" for user "user0" should be "ownCloud test text file 0" plus end-of-line And the content of file "/TextFile0.txt" for user "user0" should be "ownCloud test text file 1" plus end-of-line And user "user0" should not see the following elements @@ -83,8 +75,9 @@ Feature: move (rename) file And the following headers should match these regular expressions | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | And the oc job status values of last request for user "user0" should match these regular expressions - | status | /^finished$/ | - | fileId | /^[0-9a-z]{20,}$/ | + | status | /^finished$/ | + | fileId | /^[0-9a-z]{20,}$/ | + | ETag | /^"[0-9a-f]{32}"$/ | And the content of file "/PARENT/parent.txt" for user "user0" should be "ownCloud test text file parent" plus end-of-line And the content of file "/PARENT/Parent.txt" for user "user0" should be "ownCloud test text file 1" plus end-of-line And user "user0" should not see the following elements @@ -266,4 +259,4 @@ Feature: move (rename) file And the following headers should match these regular expressions | OC-JobStatus-Location | /%base_path%\/remote\.php\/dav\/job-status\/user0\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ | And the oc job status values of last request for user "user0" should match these regular expressions - | status | /^started$/ | \ No newline at end of file + | status | /^started$/ | \ No newline at end of file diff --git a/tests/acceptance/features/cliProvisioning/editUser.feature b/tests/acceptance/features/cliProvisioning/editUser.feature index cd37be6743c5..81cf1c3f0af7 100644 --- a/tests/acceptance/features/cliProvisioning/editUser.feature +++ b/tests/acceptance/features/cliProvisioning/editUser.feature @@ -22,7 +22,7 @@ Feature: edit users And the user attributes returned by the API should include | displayname | A New User | - @skip @issue-33093 + @skip @issue-23603 Scenario: the administrator can edit a user quota Given user "brand-new-user" has been created When the administrator changes the quota of user "brand-new-user" to "12MB" using the occ command diff --git a/tests/acceptance/features/webUILogin/resetPasswordUsingEmail.feature b/tests/acceptance/features/webUILogin/resetPasswordUsingEmail.feature index 57c37626b425..b56d4dfec61a 100644 --- a/tests/acceptance/features/webUILogin/resetPasswordUsingEmail.feature +++ b/tests/acceptance/features/webUILogin/resetPasswordUsingEmail.feature @@ -26,7 +26,7 @@ Feature: reset the password using an email address @skipOnEncryption @smokeTest - @skip @issue-32868 + @skip @issue-32889 Scenario: reset password for the ordinary (no encryption) case When the user requests the password reset link using the webUI And the user follows the password reset link from email address "user1@example.org"