Fix remaining acceptance tests after batch action refactoring

owncloud · Nov 17, 2021 · 90a9800 · 90a9800
1 parent 8178a30
commit 90a9800
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
@@ -127,7 +127,7 @@ Feature: deleting files and folders
     And file "zzzz-must-be-last-file-in-folder.txt" should not be listed on the webUI
     And no message should be displayed on the webUI
 
-  @public_link_share-feature-required
+  @skipOnOC10 @skipOnOCIS @public_link_share-feature-required
   Scenario: delete files from shared by link page
     Given user "Alice" has created file "lorem.txt"
     And user "Alice" has created a public link with following settings
@@ -248,7 +248,7 @@ Feature: deleting files and folders
     And as "Alice" file "lorem.txt" should not exist
     And no message should be displayed on the webUI
 
-
+  @skipOnOC10 @skipOnOCIS
   Scenario: Delete a file and folder in shared with others page
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has created file "lorem.txt"
@@ -271,7 +271,7 @@ Feature: deleting files and folders
     And as "Alice" file "lorem.txt" should not exist
     And as "Alice" folder "simple-folder" should not exist
 
-
+  @skipOnOC10 @skipOnOCIS
   Scenario: Delete multiple files at once from shared with others page
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has created file "lorem.txt"
@@ -294,7 +294,7 @@ Feature: deleting files and folders
     And no message should be displayed on the webUI
     And the deleted elements should not be listed on the webUI after a page reload
 
-  @ocis-reva-issue-39
+  @skipOnOC10 @skipOnOCIS @ocis-reva-issue-39
   Scenario: Try to delete file and folder from favorites page
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has created file "lorem.txt"

diff --git a/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature b/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature
@@ -40,7 +40,7 @@ Background: prepare user and files
     And only the following items with default items should be visible in the actions menu on the webUI
       | items                     |
       | open folder               |
-      | download folder           |
+      | download                  |
 
   @skipOnOCIS
   Scenario: observe different actions menu options on selecting a folder

diff --git a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
@@ -147,7 +147,6 @@ Feature: Restore deleted files/folders
     Then the following error message should be displayed on the webUI
      """
      Failed to restore file-to-delete-and-restore
-     The destination node is not found
      """
     #And a success message "file-to-delete-and-restore was restored successfully" should be displayed on the webUI
     #And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should not exist in the trashbin
@@ -156,6 +155,7 @@ Feature: Restore deleted files/folders
     #And as "Alice" file "simple-folder-renamed/file-to-delete-and-restore" should exist
     And as "Alice" file "simple-folder/file-to-delete-and-restore" should not exist
 
+
   @skipOnOC10 @issue-product-186 @issue-ocis-1057
   Scenario: Restore a file from trashbin whose parent folder is renamed (ocis bug demonstration)
     Given user "Alice" has created folder "simple-folder"
@@ -190,14 +190,14 @@ Feature: Restore deleted files/folders
     Then the following error message should be displayed on the webUI
      """
      Failed to restore file-to-delete-and-restore
-     The destination node is not found
      """
     #And a success message "file-to-delete-and-restore was restored successfully" should be displayed on the webUI
     #And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should not exist in the trashbin
     And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should exist in the trashbin
     And as "Alice" file "simple-folder/file-to-delete-and-restore" should not exist
     #And as "Alice" file "simple-folder/file-to-delete-and-restore" should exist
 
+
   @skipOnOC10 @issue-product-186 @issue-ocis-1057
   Scenario: Restore a file from trashbin without restoring the parent folder (ocis bug demonstration)
     Given user "Alice" has created folder "simple-folder"

diff --git a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
@@ -219,7 +219,7 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     panelActionsItems: {
-      selector: '//span[@class="oc-files-actions-sidebar-action-label"]',
+      selector: '//ul[@id="oc-files-actions-sidebar"]//span[@class="oc-files-context-action-label"]',
       locateStrategy: 'xpath'
     },
     panelSelectButtons: {