From 74ff634dd1e3affd3c6fd185625436c307f3de22 Mon Sep 17 00:00:00 2001
From: Dipak Acharya <dpakach@gmail.com>
Date: Thu, 30 May 2019 12:19:39 +0545
Subject: [PATCH] Fix suite name to match the suites in encrypion

---
 .drone.yml                                    |  2 +-
 tests/acceptance/config/behat.yml             | 27 ++++++++++---------
 .../userKeys.feature                          |  0
 3 files changed, 15 insertions(+), 14 deletions(-)
 rename tests/acceptance/features/{webUIEncryptionUserKeysType => webUIUserKeysType}/userKeys.feature (100%)

diff --git a/.drone.yml b/.drone.yml
index 33ee1b18f179..4343586e026f 100644
--- 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
index 88a01ea4fbb5..c2e35959222f 100644
--- 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/tests/acceptance/features/webUIEncryptionUserKeysType/userKeys.feature b/tests/acceptance/features/webUIUserKeysType/userKeys.feature
similarity index 100%
rename from tests/acceptance/features/webUIEncryptionUserKeysType/userKeys.feature
rename to tests/acceptance/features/webUIUserKeysType/userKeys.feature