Merge remote-tracking branch 'parent/stable-4.2' into kb-draft-5.14-lts
This commit is contained in:
commit
1d42b6b82f
59 changed files with 810 additions and 489 deletions
|
@ -5,7 +5,7 @@ require 'rails_helper'
|
|||
describe Api::V1::StreamingController do
|
||||
around(:each) do |example|
|
||||
before = Rails.configuration.x.streaming_api_base_url
|
||||
Rails.configuration.x.streaming_api_base_url = Rails.configuration.x.web_domain
|
||||
Rails.configuration.x.streaming_api_base_url = "wss://#{Rails.configuration.x.web_domain}"
|
||||
example.run
|
||||
Rails.configuration.x.streaming_api_base_url = before
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue