From fde9498dabb9cf80ac6a621c053d97fd31b481fc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 25 Aug 2023 09:09:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/factories/project_alerting_settings.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'spec/factories/project_alerting_settings.rb') diff --git a/spec/factories/project_alerting_settings.rb b/spec/factories/project_alerting_settings.rb index 2c8ca7c70a8..ef0beb6b98a 100644 --- a/spec/factories/project_alerting_settings.rb +++ b/spec/factories/project_alerting_settings.rb @@ -3,6 +3,24 @@ FactoryBot.define do factory :project_alerting_setting, class: 'Alerting::ProjectAlertingSetting' do project - token { 'access_token_123' } + token { SecureRandom.hex } + + # Remove in next required stop after %16.4 + # https://gitlab.com/gitlab-org/gitlab/-/issues/338838 + transient do + sync_http_integrations { false } + end + + trait :with_http_integration do + sync_http_integrations { true } + end + + # for simplicity, let factory exclude the AlertManagement::HttpIntegration + # created in after_commit callback on model + after(:create) do |setting, evaluator| + next if evaluator.sync_http_integrations + + setting.project.alert_management_http_integrations.last!.destroy! + end end end -- cgit v1.2.3