Merge pull request #20 from JankariTech/cleanup

Cleanup code

Author: prashant-gurung899

test/gui/config.sample.ini

@@ -9,5 +9,4 @@ CLIENT_LOG_FILE=
 TEMP_FOLDER_PATH=
 CLIENT_CONFIG_DIR=
 GUI_TEST_REPORT_DIR=
-OCIS=false
-RECORD_VIDEO_ON_FAILURE=false
+RECORD_VIDEO_ON_FAILURE=false

test/gui/shared/scripts/bdd_hooks.py

@@ -22,7 +22,7 @@
 from helpers.StacktraceHelper import get_core_dumps, generate_stacktrace
 from helpers.SyncHelper import close_socket_connection, clear_waited_after_sync
 from helpers.SpaceHelper import delete_project_spaces
-from helpers.api.provisioning import delete_created_groups, delete_created_users
+from helpers.api.provisioning import delete_created_users
 from helpers.SetupClientHelper import wait_until_app_killed, unlock_keyring
 from helpers.ConfigHelper import (
     init_config,
@@ -34,7 +34,6 @@
 )
 from helpers.FilesHelper import prefix_path_namespace, cleanup_created_paths
 from helpers.ReportHelper import save_video_recording, take_screenshot, is_video_enabled
-import helpers.api.oc10 as oc
 
 from pageObjects.Toolbar import Toolbar
 from pageObjects.AccountSetting import AccountSetting
@@ -70,7 +69,7 @@ def hook(context):
 # Order: 2
 @OnScenarioStart
 def hook(context):
-    # set owncloud config file path
+    # set opencloud config file path
     config_dir = get_config("clientConfigDir")
     if os.path.exists(config_dir):
         if len(os.listdir(config_dir)) and is_windows():
@@ -170,11 +169,7 @@ def hook(context):
 # server cleanup
 @OnScenarioEnd
 def hook(context):
-    if get_config("ocis"):
-        delete_project_spaces()
-    else:
-        oc.restore_apps_state()
-    delete_created_groups()
+    delete_project_spaces()
     delete_created_users()
 
 

test/gui/shared/scripts/helpers/ConfigHelper.py

@@ -74,7 +74,6 @@ def get_default_home_dir():
     'tempFolderPath': 'TEMP_FOLDER_PATH',
     'clientConfigDir': 'CLIENT_CONFIG_DIR',
     'guiTestReportDir': 'GUI_TEST_REPORT_DIR',
-    'ocis': 'OCIS',
     'record_video_on_failure': 'RECORD_VIDEO_ON_FAILURE'
 }
 
@@ -97,7 +96,6 @@ def get_default_home_dir():
     'tempFolderPath': os.path.join(get_client_root_path(), 'temp'),
     'clientConfigDir': get_config_home(),
     'guiTestReportDir': os.path.abspath('../reports'),
-    'ocis': False,
     'record_video_on_failure': False,
     'files_for_upload': os.path.join(CURRENT_DIR.parent.parent, 'files-for-upload'),
     'syncConnectionName': 'Personal'
@@ -115,7 +113,7 @@ def read_cfg_file(cfg_path):
         for key, _ in CONFIG.items():
             if key in CONFIG_ENV_MAP:
                 if value := cfg.get('DEFAULT', CONFIG_ENV_MAP[key]):
-                    if key in ('ocis', 'record_video_on_failure'):
+                    if key == 'record_video_on_failure':
                         CONFIG[key] = value == 'true'
                     else:
                         CONFIG[key] = value
@@ -135,7 +133,7 @@ def init_config():
     # read and override configs from environment variables
     for key, value in CONFIG_ENV_MAP.items():
         if os.environ.get(value):
-            if key in ('ocis', 'record_video_on_failure'):
+            if key == 'record_video_on_failure':
                 CONFIG[key] = os.environ.get(value) == 'true'
             else:
                 CONFIG[key] = os.environ.get(value)

test/gui/shared/scripts/helpers/SetupClientHelper.py

@@ -15,7 +15,7 @@
 from helpers.api.utils import url_join
 from helpers.UserHelper import get_displayname_for_user, get_password_for_user
 from helpers.ReportHelper import is_video_enabled
-from helpers.api import ocis
+from helpers.api import provisioning
 
 
 
@@ -80,9 +80,8 @@ def get_resource_path(resource='', user='', space=''):
     sync_path = get_config('currentUserSyncPath')
     if user:
         sync_path = user
-    if get_config('ocis'):
-        space = space or get_config('syncConnectionName')
-        sync_path = join(sync_path, space)
+    space = space or get_config('syncConnectionName')
+    sync_path = join(sync_path, space)
     sync_path = join(get_config('clientRootSyncPath'), sync_path)
     resource = resource.replace(sync_path, '').strip('/').strip('\\')
     if is_windows():
@@ -136,7 +135,7 @@ def generate_account_config(users, space='Personal'):
     settings = QSettings("OpenCloud", "opencloud")
     users_uuids = {}
     server_url = get_config('localBackendUrl')
-    capabilities = ocis.get_capabilities()
+    capabilities = provisioning.get_capabilities()
     capabilities_variant = QJsonValue(capabilities).toVariant()
 
     for idx, username in enumerate(users):

test/gui/shared/scripts/helpers/SyncHelper.py

@@ -143,8 +143,7 @@ def get_initial_sync_patterns():
 def get_synced_pattern(resource=''):
     # get only the resource path
     sync_path = get_config('currentUserSyncPath')
-    if get_config('ocis'):
-        sync_path = os.path.join(sync_path, get_config('syncConnectionName'))
+    sync_path = os.path.join(sync_path, get_config('syncConnectionName'))
 
     if resource := resource.replace(sync_path, '').strip('\\').strip('/'):
         return SYNC_PATTERNS['single_synced']