github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update rubocop to 2.3.1.

Browse Source
This commit is contained in:
Guo Xiang Tan
2020-07-24 17:16:52 +08:00
parent a9905ef7e5
commit c6202af005
24 changed files with 360 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spec/requests/users_controller_spec.rb
View File

@ -2137,14 +2137,14 @@ describe UsersController do
context 'for an activated account with unconfirmed email' do
it 'should send an email' do
user = post_user
user.update(active: true)
user.save!
user.email_tokens.create(email: user.email)
Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, to_address: user.email))
user.update!(active: true)
user.email_tokens.create!(email: user.email)
post "/u/action/send_activation_email.json", params: {
username: user.username
}
expect_enqueued_with(job: :critical_user_email, args: { type: :signup, to_address: user.email }) do
post "/u/action/send_activation_email.json", params: {
username: user.username
}
end
expect(response.status).to eq(200)
@ -2192,10 +2192,14 @@ describe UsersController do
context 'with a valid email_token' do
it 'should send the activation email' do
user = post_user
Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
post "/u/action/send_activation_email.json", params: {
username: user.username
}
expect_enqueued_with(job: :critical_user_email, args: { type: :signup }) do
post "/u/action/send_activation_email.json", params: {
username: user.username
}
end
expect(response.status).to eq(200)
expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
end
end