diff --git a/docs/security-and-privacy/processing-of-personal-data/README.md b/docs/security-and-privacy/processing-of-personal-data/README.md index dfb5e013737..6d6d548b33b 100644 --- a/docs/security-and-privacy/processing-of-personal-data/README.md +++ b/docs/security-and-privacy/processing-of-personal-data/README.md @@ -487,7 +487,7 @@ subgraph openproject[OpenProject] end subgraph nextcloud[Nextcloud] - groupfolder[Group folder app] + groupfolder[Team folders app] appopenprojectintegration[OpenProject integration app] nextcloudapi[API] end diff --git a/docs/system-admin-guide/files/external-file-storages/health-status/README.md b/docs/system-admin-guide/files/external-file-storages/health-status/README.md index aa158792dda..7905ff92383 100644 --- a/docs/system-admin-guide/files/external-file-storages/health-status/README.md +++ b/docs/system-admin-guide/files/external-file-storages/health-status/README.md @@ -69,13 +69,13 @@ and suggested solutions. | Error code | Error description | Possible reasons | Next steps and solutions | |------------------------------------|----------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | ERR_NC_HOST_NOT_FOUND | No Nextcloud server was found at the configured host URL. | There might be a typo or the URL has changed. | Check the configuration and enter a valid URL. | -| ERR_NC_DEPENDENCY_MISSING | A required dependency is missing on the file storage. | Either the Integration OpenProject app or the Group Folders app is not enabled in Nextcloud. | Add the missing dependency to the Nextcloud server. | -| ERR_NC_DEPENDENCY_VERSION_MISMATCH | A required dependency has an outdated version. | Either the Integration OpenProject app or the Group Folders app is outdated or was not updated to the officially minimal supported version. | Update your apps to the latest version. It might be necessary to update your Nextcloud server to the latest version in order to be able to install the latest app versions. | -| ERR_NC_GROUP_FOLDER_NOT_FOUND | The group folder could not be found. | The group folder used by the Integration OpenProject app was not found. This folder is usually named `OpenProject` and is owned by the group `OpenProject`. | The group folder is used only by the automatically managed project folders mode. Try to disable this option in the Nextcloud administration for the Integration OpenProject app and reenable it afterwards. | +| ERR_NC_DEPENDENCY_MISSING | A required dependency is missing on the file storage. | Either the Integration OpenProject app or the Team Folders app is not enabled in Nextcloud. | Add the missing dependency to the Nextcloud server. | +| ERR_NC_DEPENDENCY_VERSION_MISMATCH | A required dependency has an outdated version. | Either the Integration OpenProject app or the Team Folders app is outdated or was not updated to the officially minimal supported version. | Update your apps to the latest version. It might be necessary to update your Nextcloud server to the latest version in order to be able to install the latest app versions. | +| ERR_NC_TEAM_FOLDER_NOT_FOUND | The team folder could not be found. | The team folder used by the Integration OpenProject app was not found. This folder is usually named `OpenProject` and is owned by the group `OpenProject`. | The team folder is used only by the automatically managed project folders mode. Try to disable this option in the Nextcloud administration for the Integration OpenProject app and reenable it afterwards. | | ERR_NC_OAUTH_REQUEST_UNAUTHORIZED | The current user's token is invalid. | The token of the current user could not be used for accessing the remote file storage. | If the file storage is configure to do the *Two-Way OAuth2 authorization code flow* remove the user token from **Account settings → Access tokens** of this file storage and redo the login. If the storage is configured to use SSO login, please recheck the [SSO configuration guide](../../../integrations/nextcloud/oidc-sso/) for the settings of OpenProject and Nextcloud of your specific setup. | | ERR_NC_USERLESS_ACCESS_DENIED | The userless request was unauthorized | The configured app password is invalid. | Generate a new app password in the Nextcloud administration section of the Integration OpenProject app and copy it over to the OpenProject file storage configuration form. | | WRN_NC_OAUTH_TOKEN_MISSING | The current user has no authentication token. | The current user probably never did a successful login from OpenProject to the file storage, or the token was deleted from the account details. | Visit any work package of a project, where the current file storage is used. Click on the **Login** button in the **Files** tab. | -| WRN_NC_UNEXPECTED_CONTENT | The connection request was successful, but unexpected content was found in the group folder. | The group folder `OpenProject` might contain data, that was put there by a user, or there are remnants from projects that no longer have a valid connection in OpenProject. | Go to Nextcloud and migrate or delete the data in the OpenProject group folder, that was not created by OpenProject. Further information about the unexpected data is found in the server logs. | +| WRN_NC_UNEXPECTED_CONTENT | The connection request was successful, but unexpected content was found in the team folder. | The team folder `OpenProject` might contain data, that was put there by a user, or there are remnants from projects that no longer have a valid connection in OpenProject. | Go to Nextcloud and migrate or delete the data in the OpenProject team folder, that was not created by OpenProject. Further information about the unexpected data is found in the server logs. | The officially minimal supported app versions are listed in the [system admin guide](../../../../system-admin-guide/integrations/nextcloud/#required-system-versions). diff --git a/docs/system-admin-guide/integrations/nextcloud/README.md b/docs/system-admin-guide/integrations/nextcloud/README.md index 79700cf75f6..481d81e2ffd 100644 --- a/docs/system-admin-guide/integrations/nextcloud/README.md +++ b/docs/system-admin-guide/integrations/nextcloud/README.md @@ -127,7 +127,7 @@ In case you want to use this functionality you will be requested to enter a pass ![Nextcloud Automatically managed folders](openproject_system_guide_nextcloud_integration_setup_step_9.png) > [!IMPORTANT] -> You will need to install the [Group folder](https://apps.nextcloud.com/apps/groupfolders) app in Nextcloud in order to have OpenProject automatically managed your Nextcloud folders. Each storage can only have one group folder with the same name. +> You will need to install the [Team folders](https://apps.nextcloud.com/apps/groupfolders) app in Nextcloud in order to have OpenProject automatically managed your Nextcloud folders. Each storage can only have one team folder with the same name. > [!NOTE] > When you use the **Terms of Service** app on the Nextcloud side, all terms also need to be accepted for the OpenProject user that gets created during the setup. This is set to happen automatically during the initial set-up. If you see an error message indicating otherwise or the integration does not behave as expected, please refer to the [Troubleshooting](#troubleshooting) section at the bottom of this page. @@ -244,19 +244,19 @@ To fix this please log into Nextcloud, proceed to Administration and select Open #### While setting up Project folders -While setting up the project folders we create a new user, group and group folder named `OpenProject`. At the time of set up the system expects either all of these entities to have been set up with proper permissions or none of them to be present. If one or more of these entities are present without required permissions, an error message will be displayed. +While setting up the project folders we create a new user, group and team folder named `OpenProject`. At the time of set up the system expects either all of these entities to have been set up with proper permissions or none of them to be present. If one or more of these entities are present without required permissions, an error message will be displayed. ##### Error message "The user "OpenProject" already exists" -On Nextcloud inside the _OpenProject Integration_ App, when setting up an OpenProject user, group and folder, it shows the error **"The user "OpenProject" already exists"**. This error occurs if user `OpenProject` exists but group `OpenProject` and/or group folder `OpenProject` doesn't exist, or they exist with broken permissions. To solve this problem refer to possible solutions in section [Possible solutions to Project folders setup error](#possible-solutions-to-project-folders-setup-error) +On Nextcloud inside the _OpenProject Integration_ App, when setting up an OpenProject user, group and folder, it shows the error **"The user "OpenProject" already exists"**. This error occurs if user `OpenProject` exists but group `OpenProject` and/or team folder `OpenProject` doesn't exist, or they exist with broken permissions. To solve this problem refer to possible solutions in section [Possible solutions to Project folders setup error](#possible-solutions-to-project-folders-setup-error) ##### Error message "The group "OpenProject" already exists" -On Nextcloud inside the _OpenProject Integration_ App, when setting up an OpenProject user, group and folder, it shows the error **"The group "OpenProject" already exists"**. This can occur if group or group folder `OpenProject` exists but the user `OpenProject` doesn't exist. To solve this problem refer to possible solutions in section [Possible solutions to Project folders setup error](#possible-solutions-to-project-folders-setup-error) +On Nextcloud inside the _OpenProject Integration_ App, when setting up an OpenProject user, group and folder, it shows the error **"The group "OpenProject" already exists"**. This can occur if group or team folder `OpenProject` exists but the user `OpenProject` doesn't exist. To solve this problem refer to possible solutions in section [Possible solutions to Project folders setup error](#possible-solutions-to-project-folders-setup-error) -##### Error message "The group folder name "OpenProject" already exists" +##### Error message "The team folder name "OpenProject" already exists" -On Nextcloud inside the _OpenProject Integration_ App, when setting up an OpenProject user, group and folder, it shows the error **"The group folder name "OpenProject" already exists"**. This can occur if both group and user `OpenProject` doesn't exist but the group folder `OpenProject` exists. To solve this problem refer to possible solutions in section [Possible solutions to Project folders setup error](#possible-solutions-to-project-folders-setup-error) +On Nextcloud inside the _OpenProject Integration_ App, when setting up an OpenProject user, group and folder, it shows the error **"The team folder name "OpenProject" already exists"**. This can occur if both group and user `OpenProject` doesn't exist but the team folder `OpenProject` exists. To solve this problem refer to possible solutions in section [Possible solutions to Project folders setup error](#possible-solutions-to-project-folders-setup-error) ##### Possible solutions to Project folders setup error @@ -267,7 +267,7 @@ If you are facing any of the aforementioned errors while trying to set up the `P - Remove user `OpenProject` - Remove group `OpenProject` -- Inside the _Group folders_ App (*Administration settings → Administration → Group folders*), remove group folder `OpenProject`. +- Inside the _Team folders_ App (*Administration settings → Administration → Team folders*), remove team folder `OpenProject`. **Caution: this step will delete all files in that folder. Make sure to make a copy if you want to keep these files!** - Enable the _OpenProject Integration_ App @@ -279,10 +279,10 @@ If you do care about the `OpenProject` user/group/folder data then the condition - Group `OpenProject` doesn't exist. Please check if the group exists, if not create a group named `OpenProject`. - User `OpenProject` is not a member of group `OpenProject`. Please check the user is a member of the group, if not add the user `OpenProject` to the group `OpenProject`. - User `OpenProject` is not group admin of group `OpenProject`. Please check the user is admin of the group, if not make user `OpenProject` the group admin of group `OpenProject` -- Group folder `OpenProject` doesn't exist. If you don't have the _Group folders_ App installed, please install and enable it. Inside the _Group folders_ App (*Administration settings → Administration → Group folders*) make a group folder named `OpenProject`. Add the group `OpenProject` to the group folder with all the permissions i.e. Write, Share, Delete. Add user `OpenProject` to advance permissions list. -- Group folder `OpenProject` is not assigned to group `OpenProject`. Inside the _Group folders_ App (*Administration settings → Administration → Group folders*) check if the `OpenProject` group folder has group `OpenProject` assigned to it, if not add the group `OpenProject` with all the permissions i.e. Write, Share, Delete. -- Group `OpenProject` doesn't have all the permissions for group folder `OpenProject`. Inside the _Group folders_ App (*Administration settings → Administration → Group folders*) check if the group `OpenProject` has all the permissions for group folder `OpenProject`, if not give group `OpenProject` all the permissions i.e. Write, Share, Delete. -- User `OpenProject` doesn't have advanced permissions for group folder `OpenProject`. Inside the _Group folders_ App (*Administration settings → Administration → Group folders*) check if the user `OpenProject` has advanced permissions for group folder `OpenProject`, if not add user `OpenProject` to advanced permissions list. +- Team folder `OpenProject` doesn't exist. If you don't have the _Team folders_ App installed, please install and enable it. Inside the _Team folders_ App (*Administration settings → Administration → Team folders*) make a team folder named `OpenProject`. Add the group `OpenProject` to the team folder with all the permissions i.e. Write, Share, Delete. Add user `OpenProject` to advance permissions list. +- Team folder `OpenProject` is not assigned to group `OpenProject`. Inside the _Team folders_ App (*Administration settings → Administration → Team folders*) check if the `OpenProject` team folder has group `OpenProject` assigned to it, if not add the group `OpenProject` with all the permissions i.e. Write, Share, Delete. +- Group `OpenProject` doesn't have all the permissions for team folder `OpenProject`. Inside the _Team folders_ App (*Administration settings → Administration → Team folders*) check if the group `OpenProject` has all the permissions for team folder `OpenProject`, if not give group `OpenProject` all the permissions i.e. Write, Share, Delete. +- User `OpenProject` doesn't have advanced permissions for team folder `OpenProject`. Inside the _Team_ folders_ App (*Administration settings → Administration → Team folders*) check if the user `OpenProject` has advanced permissions for team folder `OpenProject`, if not add user `OpenProject` to advanced permissions list. > [!NOTE] > The name `OpenProject` is case-sensitive, so should be in exactly that format. @@ -298,7 +298,7 @@ If you face an error while trying to delete or disable user/group "OpenProject" 2. Remove user `OpenProject` 3. Remove group `OpenProject` -4. Inside the _Group folders_ App (*Administration settings → Administration → Group folders*), remove group folder `OpenProject`. +4. Inside the _Team folders_ App (*Administration settings → Administration → Team folders*), remove team folder `OpenProject`. > [!WARNING] > This step will delete all files in that folder. Make sure to make a copy if you want to keep these files!** diff --git a/modules/storages/app/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator.rb b/modules/storages/app/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator.rb index 303af698adc..f93515ea20f 100644 --- a/modules/storages/app/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator.rb +++ b/modules/storages/app/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator.rb @@ -40,13 +40,13 @@ module Storages def validate register_checks( - :group_folder_app, :files_request, :userless_access, :group_folder_presence, :group_folder_contents + :team_folder_app, :files_request, :userless_access, :team_folder_presence, :team_folder_contents ) - group_folder_app_checks + team_folder_app_checks files_request_failed_with_unknown_error userless_access_denied - group_folder_not_found + team_folder_not_found with_unexpected_content end @@ -55,7 +55,7 @@ module Storages pass_check(:userless_access) end - def group_folder_app_checks + def team_folder_app_checks required_version = SemanticVersion.parse( nextcloud_dependencies.dig("dependencies", "team_folders_app", "min_version") ) @@ -64,17 +64,17 @@ module Storages dependency = I18n.t("storages.dependencies.nextcloud.group_folders_app") if capabilities.group_folder_disabled? - fail_check(:group_folder_app, :nc_dependency_missing, context: { dependency: }) + fail_check(:team_folder_app, :nc_dependency_missing, context: { dependency: }) elsif capabilities.group_folder_version < required_version - fail_check(:group_folder_app, :nc_dependency_version_mismatch, context: { dependency: }) + fail_check(:team_folder_app, :nc_dependency_version_mismatch, context: { dependency: }) else - pass_check(:group_folder_app) + pass_check(:team_folder_app) end end - def group_folder_not_found - files.or { it.code == :not_found and fail_check(:group_folder_presence, :nc_group_folder_not_found) } - pass_check(:group_folder_presence) + def team_folder_not_found + files.or { it.code == :not_found and fail_check(:team_folder_presence, :nc_team_folder_not_found) } + pass_check(:team_folder_presence) end def files_request_failed_with_unknown_error @@ -82,7 +82,7 @@ module Storages if failure.code == :error error "Connection validation failed with unknown error:\n" \ "\tstorage: ##{@storage.id} #{@storage.name}\n" \ - "\trequest: Group folder content\n" \ + "\trequest: Team folder content\n" \ "\tstatus: #{failure}\n" \ "\tresponse: #{failure.payload}" @@ -94,10 +94,10 @@ module Storages def with_unexpected_content unexpected_files = files.value!.reject { managed_project_folder_ids.include?(it.id) } - return pass_check(:group_folder_contents) if unexpected_files.empty? + return pass_check(:team_folder_contents) if unexpected_files.empty? log_extraneous_files(unexpected_files) - warn_check(:group_folder_contents, :nc_unexpected_content) + warn_check(:team_folder_contents, :nc_unexpected_content) end def log_extraneous_files(unexpected_files) @@ -105,7 +105,7 @@ module Storages "Name: #{file.name}, ID: #{file.id}, Location: #{file.location}" end - warn "Unexpected files/folder found in group folder:\n\t#{file_representation.join("\n\t")}" + warn "Unexpected files/folder found in team folder:\n\t#{file_representation.join("\n\t")}" end def auth_strategy = Registry["nextcloud.authentication.userless"].call diff --git a/modules/storages/app/common/storages/adapters/providers/one_drive/validators/ampf_configuration_validator.rb b/modules/storages/app/common/storages/adapters/providers/one_drive/validators/ampf_configuration_validator.rb index 9f6cbef9be8..e8b63959916 100644 --- a/modules/storages/app/common/storages/adapters/providers/one_drive/validators/ampf_configuration_validator.rb +++ b/modules/storages/app/common/storages/adapters/providers/one_drive/validators/ampf_configuration_validator.rb @@ -96,7 +96,7 @@ module Storages "Name: #{file.name}, ID: #{file.id}, Location: #{file.location}" end - warn "Unexpected files/folder found in group folder:\n\t#{file_representation.join("\n\t")}" + warn "Unexpected files/folder found in drive root folder:\n\t#{file_representation.join("\n\t")}" end def managed_project_folder_ids diff --git a/modules/storages/app/common/storages/adapters/providers/sharepoint/validators/ampf_configuration_validator.rb b/modules/storages/app/common/storages/adapters/providers/sharepoint/validators/ampf_configuration_validator.rb index 32eb3c9ed4c..8d7718759d9 100644 --- a/modules/storages/app/common/storages/adapters/providers/sharepoint/validators/ampf_configuration_validator.rb +++ b/modules/storages/app/common/storages/adapters/providers/sharepoint/validators/ampf_configuration_validator.rb @@ -97,7 +97,7 @@ module Storages "Name: #{file.name}, ID: #{file.id}, Location: #{file.location}" end - warn "Unexpected files/folder found in group folder:\n\t#{file_representation.join("\n\t")}" + warn "Unexpected files/folder found in drive root folder:\n\t#{file_representation.join("\n\t")}" end def managed_project_folder_ids diff --git a/modules/storages/app/services/storages/nextcloud_managed_folder_create_service.rb b/modules/storages/app/services/storages/nextcloud_managed_folder_create_service.rb index d550aca9c7e..dbcd1814f40 100644 --- a/modules/storages/app/services/storages/nextcloud_managed_folder_create_service.rb +++ b/modules/storages/app/services/storages/nextcloud_managed_folder_create_service.rb @@ -64,7 +64,7 @@ module Storages # rubocop:disable Metrics/AbcSize def prepare_remote_folders - info "Preparing the remote group folder #{group_folder}" + info "Preparing the remote team folder #{group_folder}" remote_root_folder_map.bind do |remote_folders| info "Found #{remote_folders.count} remote folders" @@ -160,7 +160,7 @@ module Storages end def ensure_root_folder_permissions(root_folder_id) - info "Setting needed permissions for user #{username} and group #{group} on the root group folder." + info "Setting needed permissions for user #{username} and group #{group} on the root team folder." permissions = [ { user_id: username, permissions: FILE_PERMISSIONS }, { group_id: group, permissions: [:read_files] } diff --git a/modules/storages/config/locales/en.yml b/modules/storages/config/locales/en.yml index 99ad8cfb9e4..495e3d32266 100644 --- a/modules/storages/config/locales/en.yml +++ b/modules/storages/config/locales/en.yml @@ -105,20 +105,20 @@ en: create_folder: 'Managed Project Folder Creation:' ensure_root_folder_permissions: 'Set Base Folder Permissions:' hide_inactive_folders: 'Hide Inactive Folders Step:' - remote_folders: 'Read contents of the group folder:' + remote_folders: 'Read contents of the team folder:' remove_user_from_group: 'Remove User from Group:' rename_project_folder: 'Rename managed project Folder:' one_drive_sync_service: create_folder: 'Managed Project Folder Creation:' ensure_root_folder_permissions: 'Set Base Folder Permissions:' hide_inactive_folders: 'Hide Inactive Folders Step:' - remote_folders: 'Read contents of the group folder:' + remote_folders: 'Read contents of the drive root folder:' rename_project_folder: 'Rename managed project Folder:' sharepoint_sync_service: create_folder: 'Managed Project Folder Creation:' ensure_root_folder_permissions: 'Set Base Folder Permissions:' hide_inactive_folders: 'Hide Inactive Folders Step:' - remote_folders: 'Read contents of the group folder:' + remote_folders: 'Read contents of the drive root folder:' rename_project_folder: 'Rename managed project Folder:' errors: messages: @@ -141,7 +141,7 @@ en: conflict: The folder %{folder_name} already exists on %{parent_location}. not_found: "%{parent_location} wasn't found." ensure_root_folder_permissions: - not_found: "%{group_folder} wasn't found. Please check your Nextcloud Group Folder setup." + not_found: "%{group_folder} wasn't found. Please check your Nextcloud Team Folder setup." permission_not_set: could not set permissions on %{group_folder}. hide_inactive_folders: permission_not_set: could not set permissions on %{path}. @@ -231,7 +231,7 @@ en: storage_delete_result_3: The automatically-managed project folder and all files in it will be deleted dependencies: nextcloud: - group_folders_app: Group Folders + group_folders_app: Team Folders integration_app: Integration OpenProject enabled_in_projects: setup_incomplete_description: This storage has an incomplete setup. Please, complete the setup before enabling it in multiple projects. @@ -278,11 +278,11 @@ en: client_folder_creation: Automatic folder creation client_folder_removal: Automatic folder deletion drive_contents: Drive content - files_request: Fetching group folder files - group_folder_app: 'Dependency: Group Folders' - group_folder_contents: Group folder content - group_folder_presence: Group folder exists + files_request: Fetching team folder files header: Automatically managed project folders + team_folder_app: 'Dependency: Team Folders' + team_folder_contents: Team folder content + team_folder_presence: Team folder exists userless_access: Server-side request authentication authentication: existing_token: User token @@ -319,12 +319,12 @@ en: client_secret_invalid: The configured OAuth 2 client secret is invalid. Please check the configuration. nc_dependency_missing: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.' nc_dependency_version_mismatch: The %{dependency} app version is not supported. Please update your Nextcloud server. - nc_group_folder_not_found: The group folder could not be found. nc_host_not_found: No Nextcloud server found at the configured host url. Please check the configuration. nc_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information. nc_oauth_request_unauthorized: The current user isn't authorized to access the remote file storage. Please check the server logs for further information. nc_oauth_token_missing: OpenProject cannot test the user level communication with Nextcloud as the user did not yet link their Nextcloud account. - nc_unexpected_content: Unexpected content found in the managed group folder. + nc_team_folder_not_found: The team folder could not be found. + nc_unexpected_content: Unexpected content found in the managed team folder. nc_userless_access_denied: The configured app password is invalid. not_configured: The connection could not be validated. Please finish configuration first. od_client_cant_delete_folder: The client is having trouble deleting folders. Please check the setup documentation for your storage. diff --git a/modules/storages/spec/common/storages/adapters/providers/nextcloud/queries/capabilities_query_spec.rb b/modules/storages/spec/common/storages/adapters/providers/nextcloud/queries/capabilities_query_spec.rb index b2e3125656f..b69cd50e720 100644 --- a/modules/storages/spec/common/storages/adapters/providers/nextcloud/queries/capabilities_query_spec.rb +++ b/modules/storages/spec/common/storages/adapters/providers/nextcloud/queries/capabilities_query_spec.rb @@ -78,7 +78,7 @@ module Storages it_behaves_like "a successful Nextcloud capabilities response" end - context "if group folder app is installed but disabled", + context "if team folder app is installed but disabled", vcr: "nextcloud/capabilities_success_team_folders_disabled" do let(:app_enabled?) { true } let(:app_version) { SemanticVersion.parse("2.11.0") } @@ -88,7 +88,7 @@ module Storages it_behaves_like "a successful Nextcloud capabilities response" end - context "if group folder app is not installed", + context "if team folder app is not installed", vcr: "nextcloud/capabilities_success_team_folders_not_installed" do let(:app_enabled?) { true } let(:app_version) { SemanticVersion.parse("2.11.0") } diff --git a/modules/storages/spec/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator_spec.rb b/modules/storages/spec/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator_spec.rb index dd100f2408c..9b840ebf078 100644 --- a/modules/storages/spec/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator_spec.rb +++ b/modules/storages/spec/common/storages/adapters/providers/nextcloud/validators/ampf_configuration_validator_spec.rb @@ -86,17 +86,17 @@ module Storages allow(subject).to receive(:nextcloud_dependencies).and_return(absurd_version) results = validator.call - expect(results[:group_folder_app]).to be_a_failure - expect(results[:group_folder_app].code).to eq(:nc_dependency_version_mismatch) - expect(results[:group_folder_app].context[:dependency]).to eq("Group Folders") + expect(results[:team_folder_app]).to be_a_failure + expect(results[:team_folder_app].code).to eq(:nc_dependency_version_mismatch) + expect(results[:team_folder_app].context[:dependency]).to eq("Team Folders") end it "integration app disabled / missing", vcr: "nextcloud/capabilities_success_team_folders_disabled" do results = validator.call - expect(results[:group_folder_app]).to be_a_failure - expect(results[:group_folder_app].code).to eq(:nc_dependency_missing) - expect(results[:group_folder_app].context[:dependency]).to eq("Group Folders") + expect(results[:team_folder_app]).to be_a_failure + expect(results[:team_folder_app].code).to eq(:nc_dependency_missing) + expect(results[:team_folder_app].context[:dependency]).to eq("Team Folders") end end @@ -119,8 +119,8 @@ module Storages it "fails the check" do results = validator.call - expect(results[:group_folder_presence]).to be_failure - expect(results[:group_folder_presence].code).to eq(:nc_group_folder_not_found) + expect(results[:team_folder_presence]).to be_failure + expect(results[:team_folder_presence].code).to eq(:nc_team_folder_not_found) end end @@ -154,8 +154,8 @@ module Storages it "warns the user about extraneous folders" do results = validator.call - expect(results[:group_folder_contents]).to be_a_warning - expect(results[:group_folder_contents].code).to eq(:nc_unexpected_content) + expect(results[:team_folder_contents]).to be_a_warning + expect(results[:team_folder_contents].code).to eq(:nc_unexpected_content) end end