Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 21 insertions, 0 deletions

diff --git a/spec/models/integration_spec.rb b/spec/models/integration_spec.rb
new file mode 100644
index 00000000000..3042fd15a7b
--- /dev/null
+++ b/spec/models/integration_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Integration do
+  let(:project_1) { create(:project) }
+  let(:project_2) { create(:project) }
+  let(:instance_integration) { create(:jira_service, :instance) }
+
+  before do
+    create(:jira_service, project: project_1, inherit_from_id: instance_integration.id)
+    create(:jira_service, project: project_2, inherit_from_id: nil)
+    create(:slack_service, project: project_1, inherit_from_id: nil)
+  end
+
+  describe '#with_custom_integration_for' do
+    it 'returns projects with custom integrations' do
+      expect(Project.with_custom_integration_for(instance_integration)).to contain_exactly(project_2)
+    end
+  end
+end