From 2c1b5b096777d8f9c8a81e30da97edc14648b53c Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 26 Jan 2022 16:56:40 +0545 Subject: [PATCH] Adjust test to avoid issue 6305 --- ...cted-failures-with-oc10-server-oauth2-login.md | 2 +- ...cted-failures-with-ocis-server-ocis-storage.md | 5 +---- .../deleteFilesFolders.feature | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md index c58881a3ffa..949da9e1d38 100644 --- a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md +++ b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md @@ -36,7 +36,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIFilesDetails/fileDetails.feature:153](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L153) ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017) -- [webUIDeleteFilesFolders/deleteFilesFolders.feature:136](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L136) +- [webUIDeleteFilesFolders/deleteFilesFolders.feature:145](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L145) - [webUIFilesSearch/search.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L63) - [webUIFilesSearch/search.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L71) - [webUIFilesSearch/search.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L84) 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 5a54dda4d22..9cda7605772 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -373,7 +373,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUITrashbinDelete/trashbinDelete.feature:48](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L48) ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017) -- [webUIDeleteFilesFolders/deleteFilesFolders.feature:136](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L136) +- [webUIDeleteFilesFolders/deleteFilesFolders.feature:145](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L145) - [webUIFilesSearch/search.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L63) - [webUIFilesSearch/search.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L71) - [webUIFilesSearch/search.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L84) @@ -510,6 +510,3 @@ Other free text and markdown formatting can be used elsewhere in the document if ### [web config update is not properly reflected after the ocis start](https://github.com/owncloud/ocis/issues/2944) - [webUIFiles/breadcrumb.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/breadcrumb.feature#L50) - -### [Selecting delete all](https://github.com/owncloud/web/issues/6305) -- [webUIDeleteFilesFolders/deleteFilesFolders.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L77) diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature index 5b38c9e6b80..8365d407d45 100644 --- a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature +++ b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature @@ -74,15 +74,24 @@ Feature: deleting files and folders And no message should be displayed on the webUI @skipOnOC10 @issue-4582 - Scenario: Delete all files at once + 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 And user "Alice" has created folder "simple-folder" in the server And the user has browsed to the files page When the user marks all files for batch action using the webUI + # Shares is a special folder that cannot be deleted on oCIS + # The user has to unmark it in order to "delete all" the rest of the items + # See discussion in web issue 6305. + And the user unmarks these files for batch action using the webUI + | name | + | Shares | And the user batch deletes the marked files using the webUI - And there should be no resources listed on the webUI - And there should be no resources listed on the webUI after a page reload + Then as "Alice" file "data.zip" should not exist in the server + And as "Alice" file "lorem.txt" should not exist in the server + And as "Alice" folder "simple-folder" should not exist in the server + And file "data.zip" should not be listed on the webUI + And the count of files and folders shown on the webUI should be 2 And no message should be displayed on the webUI @ocis-reva-issue-106 @ocis-reve-issue-442 @skipOnOC10 @issue-4582