changed search test

owncloud · Sep 7, 2023 · 5445dd1 · 5445dd1
1 parent dbd8a94
commit 5445dd1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 107 deletions.
diff --git a/.drone.star b/.drone.star
@@ -16,7 +16,7 @@ OC_CI_HUGO = "owncloudci/hugo:0.115.2"
 OC_CI_NODEJS = "owncloudci/nodejs:18"
 OC_CI_PHP = "owncloudci/php:7.4"
 OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
-OC_TESTING_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.8.3"
+OC_TESTING_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.8.5"
 OC_UBUNTU = "owncloud/ubuntu:20.04"
 PLUGINS_DOCKER = "plugins/docker:20.14"
 PLUGINS_GH_PAGES = "plugins/gh-pages:1"

diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -56,9 +56,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 ### [Listing shares via ocs API does not show path for parent folders](https://github.com/owncloud/ocis/issues/1231)
 -   [webUISharingPublicManagement/shareByPublicLink.feature:110](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L111)
 
-### [Propfind response to trashbin endpoint is different in ocis](https://github.com/owncloud/product/issues/186)
--   [webUIFilesSearch/search.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L60)
-
 ### [Conflict / overwrite issues with TUS](https://github.com/owncloud/ocis/issues/1294)
 -   [webUIUpload/uploadFileGreaterThanQuotaSize.feature:11](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature#L11)
 

diff --git a/tests/acceptance/features/webUIFilesSearch/search.feature b/tests/acceptance/features/webUIFilesSearch/search.feature
diff --git a/tests/acceptance/pageObjects/webPage.js b/tests/acceptance/pageObjects/webPage.js
@@ -1,42 +1,12 @@
 const util = require('util')
 const { client } = require('nightwatch-api')
 const { join } = require('../helpers/path')
-const { defaultUsers } = require('../helpers/userSettings')
 
 module.exports = {
   url: function () {
     return join(this.api.launchUrl, '/')
   },
   commands: {
-    /**
-     *
-     * @param {string} searchTerm
-     */
-    search: async function (searchTerm) {
-      // wait for search indexing to be finished
-      await this.pause(2000)
-      return this.initAjaxCounters()
-        .isVisible(
-          {
-            selector: '@openSearchButton',
-            suppressNotFoundErrors: true
-          },
-          (result) => {
-            if (result.value === true) {
-              this.click('@openSearchButton')
-                .waitForElementVisible('@searchInputField')
-                .setValue('@searchInputField', [searchTerm, this.api.Keys.ENTER])
-            } else {
-              this.waitForElementVisible('@searchInputField').setValue('@searchInputField', [
-                searchTerm,
-                this.api.Keys.ENTER
-              ])
-            }
-          }
-        )
-        .waitForElementNotVisible('@searchLoadingIndicator')
-        .waitForOutstandingAjaxCalls()
-    },
     /**
      * @param {string} page
      */

diff --git a/tests/acceptance/stepDefinitions/searchContext.js b/tests/acceptance/stepDefinitions/searchContext.js
diff --git a/tests/e2e/cucumber/features/smoke/search.feature b/tests/e2e/cucumber/features/smoke/search.feature
@@ -34,6 +34,7 @@ Feature: Search
       | resource                   | type   |
       | folder                     | folder |
       | FolDer/child-one/child-two | folder |
+      | strängéनेपालीName          | folder |
     And "Alice" enables the option to display the hidden file
     And "Alice" uploads the following resources
       | resource         |
@@ -105,6 +106,21 @@ Feature: Search
       | folder   |
       | FolDer   |
 
+
+    # search difficult names
+    When "Alice" searches "strängéनेपालीName" using the global search and the "everywhere" filter and presses enter
+    Then following resources should be displayed in the files list for user "Alice"
+      | strängéनेपालीName |
+
+    # deleting folder from search result and search deleted resource
+    When "Alice" deletes the following resource using the sidebar panel
+      | resource          | from |
+      | strängéनेपालीName |      |
+    And "Alice" searches "forDeleting" using the global search and the "everywhere" filter
+    Then following resources should not be displayed in the search list for user "Alice"
+      | resource          |
+      | strängéनेपालीName |
+
     And "Alice" navigates to the shared with me page
     When "Alice" reshares the following resource
       | resource             | recipient | type | role     | resourceType |