Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/finders/alert_management/alerts_finder_spec.rb b/spec/finders/alert_management/alerts_finder_spec.rb
index 87a5da38dd1..3a88db5d854 100644
--- a/spec/finders/alert_management/alerts_finder_spec.rb
+++ b/spec/finders/alert_management/alerts_finder_spec.rb
@@ -42,6 +42,12 @@ RSpec.describe AlertManagement::AlertsFinder, '#execute' do
 
           it { is_expected.to contain_exactly(resolved_alert, ignored_alert) }
         end
+
+        context 'skips domain if iid is given' do
+          let(:params) { { iid: resolved_alert.iid, domain: 'threat_monitoring' } }
+
+          it { is_expected.to contain_exactly(resolved_alert) }
+        end
       end
 
       context 'empty params' do