forked from External/greenlight
Refactored code to reduce number of database queries (#960)
This commit is contained in:
@ -67,6 +67,8 @@ describe AdminsController, type: :controller do
|
||||
|
||||
post :ban_user, params: { user_uid: @user.uid }
|
||||
|
||||
@user.reload
|
||||
|
||||
expect(@user.has_role?(:denied)).to eq(true)
|
||||
expect(flash[:success]).to be_present
|
||||
expect(response).to redirect_to(admins_path)
|
||||
@ -82,6 +84,8 @@ describe AdminsController, type: :controller do
|
||||
|
||||
post :unban_user, params: { user_uid: @user.uid }
|
||||
|
||||
@user.reload
|
||||
|
||||
expect(@user.has_role?(:denied)).to eq(false)
|
||||
expect(flash[:success]).to be_present
|
||||
expect(response).to redirect_to(admins_path)
|
||||
@ -153,6 +157,8 @@ describe AdminsController, type: :controller do
|
||||
|
||||
post :approve, params: { user_uid: @user.uid }
|
||||
|
||||
@user.reload
|
||||
|
||||
expect(@user.has_role?(:pending)).to eq(false)
|
||||
expect(flash[:success]).to be_present
|
||||
expect(response).to redirect_to(admins_path)
|
||||
|
@ -246,7 +246,6 @@ describe RoomsController, type: :controller do
|
||||
|
||||
it "should use join name if user is not logged in and meeting running" 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", {}))
|
||||
|
@ -362,6 +362,8 @@ describe UsersController, type: :controller do
|
||||
params = params.merge!(user_uid: user, user: { role_ids: "#{tmp_role1.id} #{tmp_role2.id}" })
|
||||
|
||||
expect { patch :update, params: params }.to change { ActionMailer::Base.deliveries.count }.by(1)
|
||||
|
||||
user.reload
|
||||
expect(user.roles.count).to eq(2)
|
||||
expect(user.highest_priority_role.name).to eq("test1")
|
||||
expect(response).to redirect_to(admins_path)
|
||||
|
Reference in New Issue
Block a user