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

Complete refactor of Gemfile and upgraded gems (#2553)

Browse Source
This commit is contained in:
Ahmad Farhat
2021-02-26 17:34:07 -05:00
committed by GitHub
parent c5b00e89aa
commit 09ab074aaf
29 changed files with 327 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/controllers/users_controller_spec.rb
View File

@ -416,7 +416,7 @@ describe UsersController, type: :controller do
tmp_role1.update_permission("send_promoted_email", "true")
params = random_valid_user_params
params = params.merge!(user_uid: user, user: { role_id: tmp_role1.id.to_s })
params.merge!(user_uid: user, user: { role_id: tmp_role1.id.to_s })
expect { post :update, params: params }.to change { ActionMailer::Base.deliveries.count }.by(1)
@ -440,7 +440,7 @@ describe UsersController, type: :controller do
@request.session[:user_id] = admin.id
params = random_valid_user_params
params = params.merge!(user_uid: user, user: { role_id: new_role.id.to_s })
params.merge!(user_uid: user, user: { role_id: new_role.id.to_s })
expect(user.role.name).to eq("test1")
expect(user.main_room).to be_nil
@ -503,7 +503,7 @@ describe UsersController, type: :controller do
user: {
password: "incorrect_password",
new_password: @password,
password_confirmation: @password + "_random_string",
password_confirmation: "#{@password}_random_string",
}
}
post :update_password, params: params.merge!(user_uid: @user)