Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Greenlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
56a72ade
Unverified
Commit
56a72ade
authored
6 years ago
by
Jesus Federico
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Completed fix for the specs (#343)
parent
4d9d0ebb
Branches
Branches containing commit
Tags
release-2.0.4
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/application.rb
+4
-4
4 additions, 4 deletions
config/application.rb
spec/models/room_spec.rb
+7
-3
7 additions, 3 deletions
spec/models/room_spec.rb
spec/spec_helper.rb
+2
-2
2 additions, 2 deletions
spec/spec_helper.rb
with
13 additions
and
9 deletions
config/application.rb
+
4
−
4
View file @
56a72ade
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
spec/models/room_spec.rb
+
7
−
3
View file @
56a72ade
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
spec/spec_helper.rb
+
2
−
2
View file @
56a72ade
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment