Bump commit id for tests, update expected to fail file and add config…

… for sharee auto-complete
fans4owncloud · Aug 2, 2022 · 8703e32 · 8703e32
1 parent 562f5ce
commit 8703e32
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 41 deletions.
diff --git a/.drone.env b/.drone.env
@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=004893a54af9d8c3d6f85181bfea162fd71391e7
+OCIS_COMMITID=26f15c2fa9abd1767eb0f7d60200404a613a7dc3
 OCIS_BRANCH=master
diff --git a/.drone.star b/.drone.star
@@ -18,7 +18,7 @@ OC_CI_HUGO = "owncloudci/hugo:0.89.4"
 OC_CI_NODEJS = "owncloudci/nodejs:14"
 OC_CI_PHP = "owncloudci/php:7.4"
 OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
-OC_TESTING_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.7.0"
+OC_TESTING_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.8.0"
 OC_UBUNTU = "owncloud/ubuntu:20.04"
 PLUGINS_DOCKER = "plugins/docker:18.09"
 PLUGINS_DOWNSTREAM = "plugins/downstream"
@@ -2144,6 +2144,8 @@ def ocisService():
                 "OCIS_INSECURE": "true",
                 "OCIS_LOG_LEVEL": "error",
                 "OCIS_URL": "https://ocis:9200",
+                "LDAP_GROUP_SUBSTRING_FILTER_TYPE": "any",
+                "LDAP_USER_SUBSTRING_FILTER_TYPE": "any",
                 "PROXY_ENABLE_BASIC_AUTH": True,
                 "STORAGE_HOME_DRIVER": "ocis",
                 "STORAGE_METADATA_DRIVER_OCIS_ROOT": "/srv/app/tmp/ocis/storage/metadata",
@@ -2154,6 +2156,7 @@ def ocisService():
                 "STORAGE_USERS_DRIVER_OWNCLOUD_DATADIR": "/srv/app/tmp/ocis/owncloud/data",
                 "WEB_ASSET_PATH": "%s/dist" % dir["web"],
                 "WEB_UI_CONFIG": "/srv/config/drone/config-ocis.json",
+                "FRONTEND_SEARCH_MIN_LENGTH": "2",
             },
             "commands": [
                 "cd %s/ocis-build" % dir["base"],

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       WEB_UI_CONFIG: ${WEB_UI_CONFIG:-/web/config.json}
       WEB_ASSET_PATH: ${WEB_ASSET_PATH:-/web/dist}
 
+      #FRONTEND
+      FRONTEND_SEARCH_MIN_LENGTH: "2"
       # IDM
       IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-true}"
       IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}" # override the random admin password from `ocis init`
@@ -42,6 +44,8 @@ services:
       USERS_LDAP_BIND_PASSWORD: "${USERS_LDAP_BIND_PASSWORD:-some-ldap-reva-password}"
       AUTH_BASIC_LDAP_BIND_PASSWORD: "${AUTH_BASIC_LDAP_BIND_PASSWORD:-some-ldap-reva-password}"
       GRAPH_LDAP_BIND_PASSWORD: "${GRAPH_LDAP_BIND_PASSWORD:-some-ldap-idm-password}"
+      LDAP_GROUP_SUBSTRING_FILTER_TYPE: "any"
+      LDAP_USER_SUBSTRING_FILTER_TYPE: "any"
 
       # PROXY
       PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-true}"

diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -55,35 +55,11 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIRestrictSharing/restrictSharing.feature:40](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictSharing.feature#L40)
 -   [webUIRestrictSharing/restrictSharing.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictSharing.feature#L56)
 
-### [Searching sharee with displayname](https://github.com/owncloud/ocis/issues/547)
--   [webUISharingAutocompletion/shareAutocompletion.feature:128](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L128)
--   [webUISharingAutocompletion/shareAutocompletion.feature:141](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L141)
-
-### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317)
-### [Searching sharee with displayname](https://github.com/owncloud/ocis/issues/547)
--   [webUISharingAutocompletion/shareAutocompletion.feature:76](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L76)
--   [webUISharingAutocompletion/shareAutocompletion.feature:115](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L115)
--   [webUISharingAutocompletion/shareAutocompletion.feature:154](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L154)
--   [webUISharingAutocompletion/shareAutocompletion.feature:168](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L168)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:55](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L55)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L56)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L57)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L73)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:74](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L74)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:75](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L75)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:76](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L76)
-
-### [Minimum of three characters required for autocompletion](https://github.com/owncloud/ocis/issues/1961)
--   [webUISharingAutocompletion/shareAutocompletion.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L32)
--   [webUISharingAutocompletion/shareAutocompletion.feature:44](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L44)
--   [webUISharingAutocompletion/shareAutocompletion.feature:87](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L87)
--   [webUISharingAutocompletion/shareAutocompletion.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L101)
-
 ### [Cannot create users with special characters](https://github.com/owncloud/ocis/issues/1417)
--   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L36)
 -   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L37)
 -   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L38)
 -   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:39](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L39)
+-   [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:40](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L40)
 
 ### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317)
 -   [webUISharingInternalUsersBlacklisted/shareWithUsers.feature:16](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersBlacklisted/shareWithUsers.feature#L16)

diff --git a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature
@@ -1,3 +1,7 @@
+# Most of the tests in this file is skipped in OCIS most of the tests set minimum characters for search 
+# while it can be configured in OCIS too but not in the same manner as oc10
+# the skipped tests are listed in issue https://github.com/owncloud/web/issues/7264 for further implementation in playwright 
+
 Feature: Autocompletion of share-with names
   As a user
   I want to share files, with minimal typing, to the right people or groups
@@ -28,7 +32,7 @@ Feature: Autocompletion of share-with names
       | users-finance |
       | other         |
 
-  @smokeTest @issue-ocis-1961
+  @smokeTest @issue-ocis-1961 @skipOnOCIS
   Scenario: autocompletion of regular existing users
     Given user "regularuser" has created folder "simple-folder" in the server
     And user "regularuser" has logged in using the webUI
@@ -40,7 +44,7 @@ Feature: Autocompletion of share-with names
     But only users and groups that contain the string "us" in their name or displayname should be listed in the autocomplete list on the webUI
     And the users own name should not be listed in the autocomplete list on the webUI
 
-  @smokeTest @issue-ocis-1961
+  @smokeTest @issue-ocis-1961 @skipOnOCIS
   Scenario: autocompletion of regular existing groups
     Given user "regularuser" has created folder "simple-folder" in the server
     And user "regularuser" has logged in using the webUI
@@ -72,7 +76,7 @@ Feature: Autocompletion of share-with names
     When the user types "u" in the share-with-field
     Then the autocomplete list should not be displayed on the webUI
 
-  @issue-ocis-1317
+  @skipOnOCIS
   Scenario: autocompletion when minimum characters is increased and not enough characters are typed
     Given the administrator has set the minimum characters for sharing autocomplete to "4" in the server
     And user "regularuser" has created folder "simple-folder" in the server
@@ -83,7 +87,7 @@ Feature: Autocompletion of share-with names
     When the user types "use" in the share-with-field
     Then the autocomplete list should not be displayed on the webUI
 
-  @issue-ocis-1961
+  @issue-ocis-1961 @skipOnOCIS
   Scenario: autocomplete short user/display names when completely typed
     Given the administrator has set the minimum characters for sharing autocomplete to "3" in the server
     And user "regularuser" has created folder "simple-folder" in the server
@@ -97,7 +101,7 @@ Feature: Autocompletion of share-with names
     When the user types "Use" in the share-with-field
     Then "user" "Use" should be listed in the autocomplete list on the webUI
 
-  @issue-ocis-1961
+  @issue-ocis-1961 @skipOnOCIS
   Scenario: autocomplete short group names when completely typed
     Given the administrator has set the minimum characters for sharing autocomplete to "2" in the server
     And user "regularuser" has created folder "simple-folder" in the server
@@ -111,7 +115,7 @@ Feature: Autocompletion of share-with names
     When the user types "fi" in the share-with-field
     Then "group" "fi" should be listed in the autocomplete list on the webUI
 
-  @issue-ocis-1317
+  @skipOnOCIS
   Scenario: autocompletion when increasing the minimum characters for sharing autocomplete
     Given the administrator has set the minimum characters for sharing autocomplete to "3" in the server
     And user "regularuser" has created folder "simple-folder" in the server
@@ -124,7 +128,7 @@ Feature: Autocompletion of share-with names
     But only users and groups that contain the string "use" in their name or displayname should be listed in the autocomplete list on the webUI
     And the users own name should not be listed in the autocomplete list on the webUI
 
-
+  @skipOnOCIS
   Scenario: autocompletion of a pattern that matches regular existing users but also a user with whom the item is already shared (folder)
     Given user "regularuser" has created folder "simple-folder" in the server
     And user "regularuser" has logged in using the webUI
@@ -137,7 +141,7 @@ Feature: Autocompletion of share-with names
     But only users and groups that contain the string "user" in their name or displayname should be listed in the autocomplete list on the webUI
     And the users own name should not be listed in the autocomplete list on the webUI
 
-
+  @skipOnOCIS
   Scenario: autocompletion of a pattern that matches regular existing users but also a user with whom the item is already shared (file)
     Given user "regularuser" has created file "data.zip" in the server
     And user "regularuser" has logged in using the webUI
@@ -150,7 +154,7 @@ Feature: Autocompletion of share-with names
     But only users and groups that contain the string "user" in their name or displayname should be listed in the autocomplete list on the webUI
     And the users own name should not be listed in the autocomplete list on the webUI
 
-  @issue-ocis-1317
+ @skipOnOCIS
   Scenario: autocompletion of a pattern that matches regular existing groups but also a group with whom the item is already shared (folder)
     Given the administrator has set the minimum characters for sharing autocomplete to "2" in the server
     And user "regularuser" has created folder "simple-folder" in the server
@@ -164,7 +168,7 @@ Feature: Autocompletion of share-with names
     But only users and groups that contain the string "fi" in their name or displayname should be listed in the autocomplete list on the webUI
     And the users own name should not be listed in the autocomplete list on the webUI
 
-  @issue-ocis-1317
+  @skipOnOCIS
   Scenario: autocompletion of a pattern that matches regular existing groups but also a group with whom the item is already shared (file)
     Given the administrator has set the minimum characters for sharing autocomplete to "2" in the server
     And user "regularuser" has created file "data.zip" in the server

diff --git a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature
@@ -1,3 +1,4 @@
+# the tests skipped on OCIS are listed in issue https://github.com/owncloud/web/issues/7264 for further implementation in playwright 
 Feature: Autocompletion of share-with names
   As a user
   I want to share files, with minimal typing, to the right people or groups
@@ -38,7 +39,7 @@ Feature: Autocompletion of share-with names
       | ocusr-_. | oc     |
       | _ocusr@  | _u     |
 
-  @issue-ocis-1317 @issue-ocis-1675
+  @issue-ocis-1317 @issue-ocis-1675 @skipOnOCIS
   Scenario Outline: autocompletion of user having special characters in their displaynames
     Given these users have been created without initialization and without skeleton files in the server:
       | username  | password  | displayname   | email             |
@@ -65,12 +66,15 @@ Feature: Autocompletion of share-with names
     And user "regularuser" has logged in using the webUI
     And the user has browsed to the personal page
     And the user has opened the share dialog for file "data.zip"
-
     When the user types "<search>" in the share-with-field
     Then only users and groups that contain the string "<search>" in their name or displayname should be listed in the autocomplete list on the webUI
     Examples:
       | group    | search |
       | @-_.     | @-     |
-      | -_.ocgrp | -_     |
-      | ocgrp-_. | oc     |
       | _ocgrp@  | _u     |
+
+    @skipOnOCIS
+    Examples:
+      | group    | search |
+      | ocgrp-_. | oc     |
+      | -_.ocgrp | -_     |