github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: send activation email when accepting invite if password is set

Browse Source
This commit is contained in:
Arpit Jalan
2017-04-15 14:48:05 +05:30
parent c155b05595
commit 0954367bf4
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/controllers/invites_controller_spec.rb
View File

@ -223,10 +223,11 @@ describe InvitesController do
end
end
context 'welcome message' do
context 'welcome message and activation email' do
before do
Invite.any_instance.stubs(:redeem).returns(user)
Jobs.expects(:enqueue).with(:invite_email, has_key(:invite_id))
user.password_hash = nil
end
it 'sends a welcome message if set' do
@ -239,6 +240,12 @@ describe InvitesController do
user.expects(:enqueue_welcome_message).with('welcome_invite').never
xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
end
it 'sends an activation email if password is set' do
user.password_hash = 'qaw3ni3h2wyr63lakw7pea1nrtr44pls'
Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, user_id: user.id))
xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
end
end
end
end