Address reviews

owncloud · Sep 7, 2022 · 06de029 · 06de029
1 parent 380d78a
commit 06de029
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/tests/e2e/cucumber/features/integrations/search.feature b/tests/e2e/cucumber/features/integrations/search.feature
@@ -25,7 +25,7 @@ Feature: link
       | FolDer       |
       | folderPublic |
 #    Uncomment the following step after this issue is fixed https://github.com/owncloud/ocis/issues/4517
-#    But following resource should not be listed in the search list for user "Alice"
+#    But following resources should not be displayed in the search list for user "Alice"
 #      | resource |
 #      | public   |
     When "Alice" creates the following resources
@@ -44,16 +44,16 @@ Feature: link
     But following resources should not be displayed in the search list for user "Alice"
       | resource    |
       | test-folder |
-    And "Alice" opens the "files" app
+    When "Alice" opens the "files" app
     And "Alice" searches "foldeR" using the global search
     Then following resources should be displayed in the search list for user "Alice"
       | resource     |
       | folder       |
       | new-folder   |
       | FolDer       |
       | folderPublic |
-    And "Alice" opens the "files" app
-    When "Alice" uploads the following resources
+    When "Alice" opens the "files" app
+    And "Alice" uploads the following resources
       | resource          |
       | new-lorem.txt     |
       | new-lorem-big.txt |
@@ -65,9 +65,9 @@ Feature: link
       | new-lorem-big.txt |
       | new-data.zip      |
       | new-folder        |
-    And "Alice" opens the "files" app
-    When "Alice" enables the option to display the hidden file
-    When "Alice" uploads the following resources
+    When "Alice" opens the "files" app
+    And "Alice" enables the option to display the hidden file
+    And "Alice" uploads the following resources
       | resource         |
       | .hidden-file.txt |
     And "Alice" searches "hidden" using the global search

diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -375,11 +375,6 @@ export const emptyTrashBinResources = async (page): Promise<string> => {
   return message.trim().toLowerCase()
 }
 
-export interface deleteResourceTrashbinArgs {
-  resource: string
-  page: Page
-}
-
 export const deleteResourceTrashbin = async (args: deleteResourceArgs): Promise<string> => {
   const { page, resource } = args
   const resourceCheckbox = page.locator(util.format(checkBoxForTrashbin, resource))

diff --git a/tests/e2e/support/objects/app-files/resource/index.ts b/tests/e2e/support/objects/app-files/resource/index.ts
@@ -5,7 +5,6 @@ import {
   deleteResource,
   deleteResourceArgs,
   deleteResourceTrashbin,
-  deleteResourceTrashbinArgs,
   downloadResources,
   downloadResourcesArgs,
   downloadResourceVersion,
@@ -105,7 +104,7 @@ export class Resource {
     return await emptyTrashBinResources(this.#page)
   }
 
-  async deleteTrashBin(args: Omit<deleteResourceTrashbinArgs, 'page'>): Promise<string> {
+  async deleteTrashBin(args: Omit<deleteResourceArgs, 'page'>): Promise<string> {
     const startUrl = this.#page.url()
     const message = await deleteResourceTrashbin({ ...args, page: this.#page })
     await this.#page.goto(startUrl)