diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:42:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:43:16 +0000 |
commit | b55e13ec164336d1e5d5bbdbca939edcc31d557f (patch) | |
tree | b3283adcd5aa0cd6ac55afc75793189e7507e4ae /spec/initializers | |
parent | ceaba594d07563402ac901c958b9a6e27c4964dc (diff) | |
download | gitlab-ce-b55e13ec164336d1e5d5bbdbca939edcc31d557f.tar.gz |
Add latest changes from gitlab-org/security/gitlab@14-6-stable-ee
Diffstat (limited to 'spec/initializers')
-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 = { |