lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-206: Remove support for the flash client Fixes(#654) (#661)

Browse Source 
* Remove ability to specify flash client

* Always join via html5

* Fix styling and tests
This commit is contained in:
shawn-higgins1
2019-07-24 09:37:59 -04:00
committed by Jesus Federico
parent 4e31366012
commit 0934919e44
8 changed files with 14 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/controllers/rooms_controller_spec.rb
View File

@ -119,10 +119,10 @@ describe RoomsController, type: :controller do
@request.session[:user_id] = @owner.id
name = Faker::Games::Pokemon.name
room_params = { name: name, "client": "html5", "mute_on_join": "1",
room_params = { name: name, "mute_on_join": "1",
"require_moderator_approval": "1", "anyone_can_start": "1" }
json_room_settings = "{\"muteOnStart\":true,\"requireModeratorApproval\":true," \
"\"joinViaHtml5\":true,\"anyoneCanStart\":true}"
"\"anyoneCanStart\":true}"
post :create, params: { room: room_params }
@ -145,7 +145,7 @@ describe RoomsController, type: :controller do
it "should redirect back to main room with error if it fails" do
@request.session[:user_id] = @owner.id
room_params = { name: "", "client": "html5", "mute_on_join": "1" }
room_params = { name: "", "mute_on_join": "1" }
post :create, params: { room: room_params }
@ -158,7 +158,7 @@ describe RoomsController, type: :controller do
@request.session[:user_id] = @owner.id
room_params = { name: Faker::Games::Pokemon.name, "client": "html5", "mute_on_join": "1" }
room_params = { name: Faker::Games::Pokemon.name, "mute_on_join": "1" }
post :create, params: { room: room_params }
@ -358,9 +358,9 @@ describe RoomsController, type: :controller do
it "properly updates room settings through the room settings modal and redirects to current page" do
@request.session[:user_id] = @user.id
room_params = { "client": "html5", "mute_on_join": "1", "name": @secondary_room.name }
room_params = { "mute_on_join": "1", "name": @secondary_room.name }
formatted_room_params = "{\"muteOnStart\":true,\"requireModeratorApproval\":false," \
"\"joinViaHtml5\":true,\"anyoneCanStart\":false}" # JSON string format
"\"anyoneCanStart\":false}" # JSON string format
expect { post :update_settings, params: { room_uid: @secondary_room.uid, room: room_params } }
.to change { @secondary_room.reload.room_settings }

3
spec/models/room_spec.rb
View File

@ -96,10 +96,11 @@ describe Room, type: :model do
endpoint = Rails.configuration.bigbluebutton_endpoint
secret = Rails.configuration.bigbluebutton_secret
fullname = "fullName=Example"
join_via_html5 = "&join_via_html5=true"
meeting_id = "&meetingID=#{@room.bbb_id}"
password = "&password=testpass"
query = fullname + meeting_id + password
query = fullname + join_via_html5 + meeting_id + password
checksum_string = "join#{query + secret}"
checksum = OpenSSL::Digest.digest('sha1', checksum_string).unpack1("H*")