diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-12 03:16:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-12 03:16:35 +0300 |
commit | d237ada361f68864b2f46af58a097dcbde844675 (patch) | |
tree | dcd6cb863d7ca8dd929f4d1acd13f369797b43d9 /spec/initializers/action_cable_subscription_adapter_identifier_spec.rb | |
parent | 830c9943a95cbd755700d6624c64a158b2602cd0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers/action_cable_subscription_adapter_identifier_spec.rb')
-rw-r--r-- | spec/initializers/action_cable_subscription_adapter_identifier_spec.rb | 6 |
1 files changed, 6 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 index 12988b851ef..074df9adc21 100644 --- a/spec/initializers/action_cable_subscription_adapter_identifier_spec.rb +++ b/spec/initializers/action_cable_subscription_adapter_identifier_spec.rb @@ -4,6 +4,12 @@ require 'spec_helper' RSpec.describe 'ActionCableSubscriptionAdapterIdentifier override' do describe '#identifier' do + let!(:original_config) { ::ActionCable::Server::Base.config.cable } + + after do + ::ActionCable::Server::Base.config.cable = original_config + end + context 'when id key is nil on cable.yml' do it 'does not override server config id with action cable pid' do config = { |