Merge branch 'master' into room-settings

2020-04-28 13:12:20 -04:00
parent 1d88f54b44 b08b1ff013
commit 44bd2315b2
9 changed files with 29 additions and 9 deletions
--- a/spec/controllers/rooms_controller_spec.rb
+++ b/spec/controllers/rooms_controller_spec.rb
@ -248,7 +248,7 @@ describe RoomsController, type: :controller do
      allow_any_instance_of(BigBlueButton::BigBlueButtonApi).to receive(:is_meeting_running?).and_return(true)
      post :join, params: { room_uid: @room, join_name: "Join Name" }

-      expect(response).to redirect_to(join_path(@owner.main_room, "Join Name", {}))
+      expect(response).to redirect_to(join_path(@owner.main_room, "Join Name", {}, response.cookies["guest_id"]))
    end

    it "should render wait if meeting isn't running" do