Merge pull request #35370 from owncloud/stable10-fix-suites-name

[stable10] Fix test suites name to match encryption app.
owncloud · May 30, 2019 · 0039256 · 0039256
2 parents 7b0b9c5 + 74ff634
commit 0039256
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1172,7 +1172,7 @@ matrix:
     - PHP_VERSION: 7.1
       TEST_SUITE: selenium
       BROWSER: chrome
-      BEHAT_SUITE: webUIEncryptionUserKeysType
+      BEHAT_SUITE: webUIUserKeysType
       DB_TYPE: mariadb
       USE_SERVER: true
       SERVER_PROTOCOL: https

diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
@@ -293,19 +293,6 @@ default:
         - WebUILoginContext:
         - WebUISharingContext:
 
-    webUIEncryptionUserKeysType:
-      paths:
-        - '%paths.base%/../features/webUIEncryptionUserKeysType'
-      contexts:
-        - WebUIAdminEncryptionSettingsContext:
-        - WebUIPersonalEncryptionSettingsContext:
-        - WebUIGeneralContext:
-        - WebUILoginContext:
-        - FeatureContext: *common_feature_context_params
-        - EncryptionContext:
-        - OccContext:
-        - WebDavPropertiesContext:
-
     webUIFavorites:
       paths:
         - '%paths.base%/../features/webUIFavorites'
@@ -504,6 +491,20 @@ default:
         - WebUISharingContext:
         - PublicWebDavContext:
 
+    # This suite is part of the encryption app in later core versions
+    webUIUserKeysType:
+      paths:
+        - '%paths.base%/../features/webUIUserKeysType'
+      contexts:
+        - WebUIAdminEncryptionSettingsContext:
+        - WebUIPersonalEncryptionSettingsContext:
+        - WebUIGeneralContext:
+        - WebUILoginContext:
+        - FeatureContext: *common_feature_context_params
+        - EncryptionContext:
+        - OccContext:
+        - WebDavPropertiesContext:
+
     # This suite is part of the user_management app in later core versions
     webUIManageQuota:
       paths:

diff --git a/...UIEncryptionUserKeysType/userKeys.feature → ...atures/webUIUserKeysType/userKeys.feature b/...UIEncryptionUserKeysType/userKeys.feature → ...atures/webUIUserKeysType/userKeys.feature