Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/initializers/action_cable_subscription_adapter_identifier_spec.rb b/spec/initializers/action_cable_subscription_adapter_identifier_spec.rb
new file mode 100644
index 00000000000..12988b851ef
--- /dev/null
+++ b/spec/initializers/action_cable_subscription_adapter_identifier_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'ActionCableSubscriptionAdapterIdentifier override' do
+  describe '#identifier' do
+    context 'when id key is nil on cable.yml' do
+      it 'does not override server config id with action cable pid' do
+        config = {
+          adapter: 'redis',
+          url: 'unix:/home/localuser/redis/redis.socket',
+          channel_prefix: 'test_',
+          id: nil
+        }
+        ::ActionCable::Server::Base.config.cable = config
+
+        sub = ActionCable.server.pubsub.send(:redis_connection)
+
+        expect(sub.connection[:id]).to eq('redis:///home/localuser/redis/redis.socket/0')
+        expect(ActionCable.server.config.cable[:id]).to be_nil
+      end
+    end
+  end
+end