Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 15 insertions, 4 deletions

diff --git a/spec/models/integrations/base_chat_notification_spec.rb b/spec/models/integrations/base_chat_notification_spec.rb
index ac4031a9b7d..672d8de1e14 100644
--- a/spec/models/integrations/base_chat_notification_spec.rb
+++ b/spec/models/integrations/base_chat_notification_spec.rb
@@ -3,15 +3,14 @@
 require 'spec_helper'
 
 RSpec.describe Integrations::BaseChatNotification do
-  describe 'Associations' do
+  describe 'validations' do
     before do
       allow(subject).to receive(:activated?).and_return(true)
+      allow(subject).to receive(:default_channel_placeholder).and_return('placeholder')
+      allow(subject).to receive(:webhook_placeholder).and_return('placeholder')
     end
 
     it { is_expected.to validate_presence_of :webhook }
-  end
-
-  describe 'validations' do
     it { is_expected.to validate_inclusion_of(:labels_to_be_notified_behavior).in_array(%w[match_any match_all]).allow_blank }
   end
 
@@ -274,4 +273,16 @@ RSpec.describe Integrations::BaseChatNotification do
       it_behaves_like 'with channel specified', 'slack-integration, #slack-test, @UDLP91W0A', ['slack-integration', '#slack-test', '@UDLP91W0A']
     end
   end
+
+  describe '#default_channel_placeholder' do
+    it 'raises an error' do
+      expect { subject.default_channel_placeholder }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#webhook_placeholder' do
+    it 'raises an error' do
+      expect { subject.webhook_placeholder }.to raise_error(NotImplementedError)
+    end
+  end
 end