diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 06:07:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-06 06:07:26 +0300 |
commit | 5e448ff06309854c838fb5eaa46fd05ebc5218ab (patch) | |
tree | 0fd59db933c6f11053028559a8f6fc2e2b050f6e /spec/requests | |
parent | bdad4dd5dabec7a0a611d5241fa2d56359884420 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/integrations_spec.rb | 14 | ||||
-rw-r--r-- | spec/requests/api/projects_spec.rb | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/spec/requests/api/integrations_spec.rb b/spec/requests/api/integrations_spec.rb index 8d348dc0a54..8334d6b6832 100644 --- a/spec/requests/api/integrations_spec.rb +++ b/spec/requests/api/integrations_spec.rb @@ -44,11 +44,17 @@ RSpec.describe API::Integrations, feature_category: :integrations do end where(:integration) do - # The API supports all integrations except the GitLab Slack Application - # integration; this integration must be installed via the UI. + # The Project Integrations API supports all integrations except: + # - The GitLab Slack Application integration, as it must be installed via the UI. + # - Shimo and ZenTao integrations, as new integrations are blocked from being created. + unavailable_integration_names = [ + Integrations::GitlabSlackApplication.to_param, + Integrations::Shimo.to_param, + Integrations::Zentao.to_param + ] + names = Integration.available_integration_names - names.delete(Integrations::GitlabSlackApplication.to_param) if Gitlab.ee? - names - %w[shimo zentao] + names.reject { |name| name.in?(unavailable_integration_names) } end with_them do diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 1b08e7f0dc6..bb96771b3d5 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -2158,7 +2158,7 @@ RSpec.describe API::Projects, :aggregate_failures, feature_category: :groups_and end shared_examples 'capped upload attachments' do |upload_allowed| - it "limits the upload to 1 GB" do + it "limits the upload to 1 GiB" do expect_next_instance_of(UploadService) do |instance| expect(instance).to receive(:override_max_attachment_size=).with(1.gigabyte).and_call_original end |