diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md index 946962fe850..b06e91cf39a 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -195,12 +195,12 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingAcceptShares/acceptShares.feature:228](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L228) ### [Share not created with default permissions](https://github.com/owncloud/ocis/issues/1277) -- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L60) -- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L61) -- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L62) -- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L63) -- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:64](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L64) -- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:65](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L65) +- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:90](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L90) +- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:91](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L91) +- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:92](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L92) +- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:93](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L93) +- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:94](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L94) +- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:95](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L95) - [webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature:54](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature#L54) - [webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature:55](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature#L55) - [webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature#L56) @@ -222,12 +222,12 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingInternalGroups/shareWithGroups.feature:74](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L74) - [webUISharingInternalGroups/shareWithGroups.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L72) - [webUISharingInternalGroups/shareWithGroups.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L73) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:53](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L53) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:54](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L54) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:55](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L55) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L56) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L57) -- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:58](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L58) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L84) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:85](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L85) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:86](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L86) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:87](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L87) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L88) +- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:89](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L89) - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:48](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L48) - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:49](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L49) - [webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature#L50) diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature index fa5c0fdfcab..e60700686e3 100644 --- a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature +++ b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature @@ -55,7 +55,7 @@ Feature: deleting files and folders | "question?" | | "&and#hash" | - @smokeTest @issue-4582 @disablePreviews @skipOnOC10 @issue-core-38221 + @smokeTest @issue-4582 @disablePreviews @skipOnOC10 @issue-core-38221 @skipOnOCIS @issue-ocis-3612 Scenario: Delete multiple files at once Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server And user "Alice" has created file "lorem.txt" in the server @@ -73,7 +73,7 @@ Feature: deleting files and folders And the deleted elements should not be listed on the webUI after a page reload And no message should be displayed on the webUI - @skipOnOC10 @issue-4582 + @skipOnOC10 @issue-4582 @skipOnOCIS @issue-ocis-3612 Scenario: Delete all files at once at the root level Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server And user "Alice" has created file "lorem.txt" in the server @@ -87,7 +87,7 @@ Feature: deleting files and folders And file "data.zip" should not be listed on the webUI And no message should be displayed on the webUI - @ocis-reva-issue-106 @ocis-reve-issue-442 @skipOnOC10 @issue-4582 + @ocis-reva-issue-106 @ocis-reve-issue-442 @skipOnOC10 @issue-4582 @skipOnOCIS @issue-ocis-3612 Scenario: Delete all except for a few files at once Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server And user "Alice" has created file "lorem.txt" in the server @@ -203,7 +203,7 @@ Feature: deleting files and folders | question? | | &and#hash | - @issue-4582 + @issue-4582 @skipOnOCIS @issue-ocis-3612 Scenario: Delete multiple files at once on a public share Given user "Alice" has created folder "simple-folder" in the server And user "Alice" has created file "simple-folder/data.zip" in the server @@ -260,7 +260,7 @@ Feature: deleting files and folders And as "Alice" file "lorem.txt" should not exist in the server And as "Alice" folder "simple-folder" should not exist in the server - + @skipOnOCIS @issue-ocis-3612 Scenario: Delete folder with dot in the name Given user "Alice" has created the following folders in the server | folders | diff --git a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature index 865f28c9135..12efa789fb5 100644 --- a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature +++ b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature @@ -11,11 +11,11 @@ Feature: Sharing folders with multiple internal users using advanced permissions | Alice | | Brian | | Carol | + And user "Alice" has created folder "/simple-folder" in the server + And user "Alice" has logged in using the webUI - @issue-ocis-1922 + @skipOnOCIS @issue-ocis-3613 Scenario Outline: share a folder with multiple users using role as advanced permissions role and different extra permissions - Given user "Alice" has created folder "/simple-folder" in the server - And user "Alice" has logged in using the webUI When the user opens the share dialog for folder "simple-folder" using the webUI And the user selects the following collaborators for the share as "" with "" permissions: | collaborator | type | @@ -50,6 +50,37 @@ Feature: Sharing folders with multiple internal users using advanced permissions | Custom permissions | Custom permissions | delete, update | delete, update | read, delete, update | | Custom permissions | Custom permissions | update, create | update, create | read, update, create | | Custom permissions | Custom permissions | delete, create | delete, create | read, delete, create | + + @issue-ocis-1277 + Scenario Outline: share a folder with multiple users using role as advanced permissions role and different extra permissions (share) + When the user opens the share dialog for folder "simple-folder" using the webUI + And the user selects the following collaborators for the share as "" with "" permissions: + | collaborator | type | + | Brian Murphy | user | + | Carol King | user | + And the user shares with the selected collaborators + And user "Brian" accepts the share "Shares/simple-folder" offered by user "Alice" using the sharing API in the server + And user "Carol" accepts the share "Shares/simple-folder" offered by user "Alice" using the sharing API in the server + Then custom permissions "" should be set for user "Brian Murphy" for folder "simple-folder" on the webUI + And custom permissions "" should be set for user "Carol King" for folder "simple-folder" on the webUI + And user "Brian Murphy" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI + And user "Carol King" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI + And user "Brian" should have received a share with these details in the server: + | field | value | + | uid_owner | Alice | + | share_with | Brian | + | file_target | /Shares/simple-folder | + | item_type | folder | + | permissions | | + And user "Carol" should have received a share with these details in the server: + | field | value | + | uid_owner | Alice | + | share_with | Carol | + | file_target | /Shares/simple-folder | + | item_type | folder | + | permissions | | + Examples: + | role | displayed-role | extra-permissions | displayed-permissions | actual-permissions | | Custom permissions | Custom permissions | share, delete | share, delete | read, share, delete | | Custom permissions | Custom permissions | share, update | share, update | read, update, share | | Custom permissions | Custom permissions | share, create | share, create | read, share, create | diff --git a/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature b/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature index 71c74264620..e75f9356299 100644 --- a/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature +++ b/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature @@ -1,4 +1,3 @@ -@issue-ocis-1922 Feature: Sharing folders with internal groups with role as advanced permissions As a user I want to set different permissions on shared folders with groups @@ -18,11 +17,11 @@ Feature: Sharing folders with internal groups with role as advanced permissions | grp2 | And user "Brian" has been added to group "grp1" in the server And user "Carol" has been added to group "grp2" in the server + And user "Alice" has created folder "simple-folder" in the server + And user "Alice" has logged in using the webUI - + @skipOnOCIS @issue-ocis-3613 Scenario Outline: share a folder with multiple groups with role as advanced permissions and different extra permissions - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has logged in using the webUI When the user opens the share dialog for folder "simple-folder" using the webUI And the user selects the following collaborators for the share as "" with "" permissions: | collaborator | type | @@ -57,6 +56,37 @@ Feature: Sharing folders with internal groups with role as advanced permissions | Custom permissions | Custom permissions | delete, update | delete, update | read, delete, update | | Custom permissions | Custom permissions | delete, create | delete, create | read, delete, create | | Custom permissions | Custom permissions | update, create | update, create | read, update, create | + + @issue-ocis-1277 + Scenario Outline: share a folder with multiple groups with role as advanced permissions and different extra permissions (share) + When the user opens the share dialog for folder "simple-folder" using the webUI + And the user selects the following collaborators for the share as "" with "" permissions: + | collaborator | type | + | grp1 | group | + | grp2 | group | + And the user shares with the selected collaborators + And user "Brian" accepts the share "Shares/simple-folder" offered by user "Alice" using the sharing API in the server + And user "Carol" accepts the share "Shares/simple-folder" offered by user "Alice" using the sharing API in the server + Then custom permissions "" should be set for group "grp2" for folder "simple-folder" on the webUI + And custom permissions "" should be set for group "grp1" for folder "simple-folder" on the webUI + And group "grp2" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI + And group "grp1" should be listed as "" in the collaborators list for folder "simple-folder" on the webUI + And user "Brian" should have received a share with these details in the server: + | field | value | + | uid_owner | Alice | + | share_with | grp1 | + | file_target | /Shares/simple-folder | + | item_type | folder | + | permissions | | + And user "Carol" should have received a share with these details in the server: + | field | value | + | uid_owner | Alice | + | share_with | grp2 | + | file_target | /Shares/simple-folder | + | item_type | folder | + | permissions | | + Examples: + | role | displayed-role | extra-permissions | displayed-permissions | actual-permissions | | Custom permissions | Custom permissions | share, delete | share, delete | read, share, delete | | Custom permissions | Custom permissions | share, update | share, update | read, update, share | | Custom permissions | Custom permissions | share, create | share, create | read, share, create | diff --git a/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature b/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature index 22b3625e3ec..dffcc31c659 100644 --- a/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature +++ b/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature @@ -52,7 +52,7 @@ Feature: files and folders can be deleted from the trashbin When the user deletes folder "Folder,With,Comma" using the webUI Then folder "Folder,With,Comma" should not be listed on the webUI - @ocisSmokeTest @skipOnOC10 @issue-4582 + @ocisSmokeTest @skipOnOC10 @issue-4582 @skipOnOCIS @issue-ocis-3612 Scenario: Select some files and delete from trashbin in a batch When the user batch deletes these files using the webUI | name | @@ -101,7 +101,7 @@ Feature: files and folders can be deleted from the trashbin Then the success message with header "All deleted files were removed" should be displayed on the webUI And there should be no resources listed on the webUI - + @skipOnOCIS @issue-ocis-3612 Scenario: Delete folders with dot in the name from trashbin Given user "Alice" has created the following folders in the server | folders | @@ -126,7 +126,7 @@ Feature: files and folders can be deleted from the trashbin Then the deleted elements should not be listed on the webUI And the deleted elements should not be listed on the webUI after a page reload - @issue-product-188 @issue-4582 + @issue-product-188 @issue-4582 @skipOnOCIS @issue-ocis-3612 Scenario: Select all except for some files and delete from trashbin in a batch When the user marks all files for batch action using the webUI And the user unmarks these files for batch action using the webUI @@ -139,7 +139,7 @@ Feature: files and folders can be deleted from the trashbin But file "data.zip" should not be listed on the webUI And folder "simple-folder" should not be listed on the webUI - @issue-product-188 @issue-4582 + @issue-product-188 @issue-4582 @skipOnOCIS @issue-ocis-3612 Scenario: Select all files and delete from trashbin in a batch When the user marks all files for batch action using the webUI And the user batch deletes the marked files using the webUI diff --git a/tests/acceptance/features/webUITrashbinFilesFolders/trashbinFilesFolders.feature b/tests/acceptance/features/webUITrashbinFilesFolders/trashbinFilesFolders.feature index 4c9b3e32201..82143777332 100644 --- a/tests/acceptance/features/webUITrashbinFilesFolders/trashbinFilesFolders.feature +++ b/tests/acceptance/features/webUITrashbinFilesFolders/trashbinFilesFolders.feature @@ -60,18 +60,16 @@ Feature: files and folders exist in the trashbin after being deleted | &and#hash | | sämple,1.txt | - @skipOnOCIS @issue-product-186 @skipOnOC10 @issue-4582 + @skipOnOCIS @issue-product-186 @skipOnOC10 @issue-4582 @issue-ocis-3612 Scenario: Delete multiple files at once and check that they are all in the trashbin When the user batch deletes these files using the webUI | name | | Folder,With,Comma | | simple-folder | - | data.zip | | lorem.txt | | sample,1.txt | And the user browses to the trashbin page - Then as "Alice" file "data.zip" should exist in the trashbin in the server - And as "Alice" file "lorem.txt" should exist in the trashbin in the server + Then as "Alice" file "lorem.txt" should exist in the trashbin in the server And as "Alice" file "sample,1.txt" should exist in the trashbin in the server And as "Alice" folder "simple-folder" should exist in the trashbin in the server And as "Alice" folder "Folder,With,Comma" should exist in the trashbin in the server diff --git a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature index dbf20a55009..b75cdbdd0f4 100644 --- a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature +++ b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature @@ -42,7 +42,7 @@ Feature: Restore deleted files/folders Then folder "folder with space" should be listed on the webUI And folder "Folder,With,Comma" should be listed on the webUI - @smokeTest @issue-1502 + @smokeTest @issue-1502 @skipOnOCIS @issue-ocis-3614 Scenario: Select some trashbin files and restore them in a batch Given user "Alice" has created folder "simple-folder" in the server And user "Alice" has uploaded file "data.zip" to "data.zip" in the server @@ -80,7 +80,7 @@ Feature: Restore deleted files/folders But file "data.zip" should not be listed on the webUI And folder "simple-folder" should not be listed on the webUI - @issue-1502 + @issue-1502 @skipOnOCIS @issue-ocis-3614 Scenario: Select all except for some trashbin files and restore them in a batch Given user "Alice" has created folder "simple-folder" in the server And user "Alice" has uploaded file "data.zip" to "data.zip" in the server @@ -111,7 +111,7 @@ Feature: Restore deleted files/folders But file "lorem.txt" should not be listed on the webUI And file "lorem-big.txt" should not be listed on the webUI - @skipOnOC10 @issue-core-38039 + @skipOnOC10 @issue-core-38039 @skipOnOCIS @issue-ocis-3614 Scenario: Select all trashbin files and restore them in a batch Given user "Alice" has created folder "simple-folder" in the server And user "Alice" has uploaded file "data.zip" to "data.zip" in the server @@ -275,7 +275,7 @@ Feature: Restore deleted files/folders Then the success message with header "fileToShare.txt was restored successfully" should be displayed on the webUI And as "Alice" file "/Shares/folder-to-share/fileToShare.txt" should exist in the server - @issue-1502 + @issue-1502 @skipOnOCIS @issue-ocis-3614 Scenario: Delete and restore folders with dot in the name Given user "Alice" has created the following folders in the server | folders | diff --git a/tests/acceptance/features/webUIUpload/upload.feature b/tests/acceptance/features/webUIUpload/upload.feature index b8a0a12ccdc..13a8ae1d569 100644 --- a/tests/acceptance/features/webUIUpload/upload.feature +++ b/tests/acceptance/features/webUIUpload/upload.feature @@ -18,7 +18,7 @@ Feature: File Upload And file "new-lorem.txt" should be listed on the webUI And as "Alice" the content of "new-lorem.txt" in the server should be the same as the content of local file "new-lorem.txt" - @smokeTest @ocisSmokeTest + @smokeTest @ocisSmokeTest @skipOnOCIS @issue-ocis-3616 Scenario: simple upload of a folder that does not exist before Given a folder "CUSTOM" has been created with the following files in separate sub-folders in the middleware | subFolder | file |