forked from External/greenlight
Completed fix for the specs (#343)
This commit is contained in:
parent
4d9d0ebb97
commit
56a72ade9d
|
@ -47,6 +47,10 @@ module Greenlight
|
|||
# The default callback url that bn launcher will redirect to
|
||||
config.gl_callback_url = ENV["GL_CALLBACK_URL"]
|
||||
|
||||
# Default credentials (test-install.blindsidenetworks.com/bigbluebutton).
|
||||
config.bigbluebutton_endpoint_default = "http://test-install.blindsidenetworks.com/bigbluebutton/api/"
|
||||
config.bigbluebutton_secret_default = "8cd8ef52e8e101574e400365b55e11a6"
|
||||
|
||||
# Setup BigBlueButton configuration.
|
||||
if config.loadbalanced_configuration
|
||||
# Fetch credentials from a loadbalancer based on provider.
|
||||
|
@ -54,10 +58,6 @@ module Greenlight
|
|||
config.loadbalancer_secret = ENV["LOADBALANCER_SECRET"]
|
||||
config.launcher_secret = ENV["LAUNCHER_SECRET"]
|
||||
else
|
||||
# Default credentials (test-install.blindsidenetworks.com/bigbluebutton).
|
||||
config.bigbluebutton_endpoint_default = "http://test-install.blindsidenetworks.com/bigbluebutton/api/"
|
||||
config.bigbluebutton_secret_default = "8cd8ef52e8e101574e400365b55e11a6"
|
||||
|
||||
# Use standalone BigBlueButton server.
|
||||
config.bigbluebutton_endpoint = ENV["BIGBLUEBUTTON_ENDPOINT"] || config.bigbluebutton_endpoint_default
|
||||
config.bigbluebutton_secret = ENV["BIGBLUEBUTTON_SECRET"] || config.bigbluebutton_secret_default
|
||||
|
|
|
@ -91,8 +91,13 @@ describe Room, type: :model do
|
|||
attendeePW: "testpass"
|
||||
)
|
||||
|
||||
endpoint = Rails.configuration.bigbluebutton_endpoint
|
||||
secret = Rails.configuration.bigbluebutton_secret
|
||||
if Rails.configuration.loadbalanced_configuration
|
||||
endpoint = Rails.configuration.loadbalancer_endpoint
|
||||
secret = Rails.configuration.loadbalancer_secret
|
||||
else
|
||||
endpoint = Rails.configuration.bigbluebutton_endpoint
|
||||
secret = Rails.configuration.bigbluebutton_secret
|
||||
end
|
||||
fullname = "fullName=Example"
|
||||
meeting_id = "&meetingID=#{@room.bbb_id}"
|
||||
password = "&password=testpass"
|
||||
|
@ -101,7 +106,6 @@ describe Room, type: :model do
|
|||
checksum_string = "join#{query + secret}"
|
||||
|
||||
checksum = OpenSSL::Digest.digest('sha1', checksum_string).unpack("H*").first
|
||||
|
||||
expect(@room.join_path("Example")).to eql("#{endpoint}join?#{query}&checksum=#{checksum}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -83,8 +83,8 @@ RSpec.configure do |config|
|
|||
<user>
|
||||
<name>greenlight</name>
|
||||
<maxMeetings>1000</maxMeetings>
|
||||
<apiURL>#{ENV['LOADBALANCER_ENDPOINT'] + 'api'}</apiURL>
|
||||
<secret>#{ENV['BIGBLUEBUTTON_SECRET']}</secret>
|
||||
<apiURL>#{ENV['LOADBALANCER_ENDPOINT']}</apiURL>
|
||||
<secret>#{ENV['LOADBALANCER_SECRET']}</secret>
|
||||
</user>
|
||||
</response>", headers: {}) if ENV['LOADBALANCER_ENDPOINT']
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue