1 files changed, 16 insertions, 52 deletions
diff --git a/spec/lib/gitlab/chat/responder_spec.rb b/spec/lib/gitlab/chat/responder_spec.rb
index a9d290cb87c..15ca3427ae8 100644
--- a/spec/lib/gitlab/chat/responder_spec.rb
+++ b/spec/lib/gitlab/chat/responder_spec.rb
@@ -4,68 +4,32 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Chat::Responder, feature_category: :integrations do
   describe '.responder_for' do
-    context 'when the feature flag is disabled' do
-      before do
-        stub_feature_flags(use_response_url_for_chat_responder: false)
-      end
-
-      context 'using a regular build' do
-        it 'returns nil' do
-          build = create(:ci_build)
+    context 'using a regular build' do
+      it 'returns nil' do
+        build = create(:ci_build)
 
-          expect(described_class.responder_for(build)).to be_nil
-        end
-      end
-
-      context 'using a chat build' do
-        it 'returns the responder for the build' do
-          pipeline = create(:ci_pipeline)
-          build = create(:ci_build, pipeline: pipeline)
-          integration = double(:integration, chat_responder: Gitlab::Chat::Responder::Slack)
-          chat_name = double(:chat_name, integration: integration)
-          chat_data = double(:chat_data, chat_name: chat_name)
-
-          allow(pipeline)
-            .to receive(:chat_data)
-            .and_return(chat_data)
-
-          expect(described_class.responder_for(build))
-            .to be_an_instance_of(Gitlab::Chat::Responder::Slack)
-        end
+        expect(described_class.responder_for(build)).to be_nil
       end
     end
 
-    context 'when the feature flag is enabled' do
-      before do
-        stub_feature_flags(use_response_url_for_chat_responder: true)
-      end
-
-      context 'using a regular build' do
-        it 'returns nil' do
-          build = create(:ci_build)
+    context 'using a chat build' do
+      let_it_be(:pipeline) { create(:ci_pipeline) }
+      let_it_be(:build) { create(:ci_build, pipeline: pipeline) }
 
-          expect(described_class.responder_for(build)).to be_nil
+      context "when response_url starts with 'https://hooks.slack.com/'" do
+        before do
+          pipeline.build_chat_data(response_url: 'https://hooks.slack.com/services/12345', chat_name_id: 'U123')
         end
+
+        it { expect(described_class.responder_for(build)).to be_an_instance_of(Gitlab::Chat::Responder::Slack) }
       end
 
-      context 'using a chat build' do
-        let(:chat_name) { create(:chat_name, chat_id: 'U123') }
-        let(:pipeline) do
-          pipeline = create(:ci_pipeline)
-          pipeline.create_chat_data!(
-            response_url: 'https://hooks.slack.com/services/12345',
-            chat_name_id: chat_name.id
-          )
-          pipeline
+      context "when response_url does not start with 'https://hooks.slack.com/'" do
+        before do
+          pipeline.build_chat_data(response_url: 'https://mattermost.example.com/services/12345', chat_name_id: 'U123')
         end
 
-        let(:build) { create(:ci_build, pipeline: pipeline) }
-        let(:responder) { described_class.new(build) }
-
-        it 'returns the responder for the build' do
-          expect(described_class.responder_for(build))
-            .to be_an_instance_of(Gitlab::Chat::Responder::Slack)
-        end
+        it { expect(described_class.responder_for(build)).to be_an_instance_of(Gitlab::Chat::Responder::Mattermost) }
       end
     end
   end