diff --git a/app/workers/user_activate_worker.rb b/app/workers/user_activate_worker.rb index 075bb6e7..d0b428cc 100644 --- a/app/workers/user_activate_worker.rb +++ b/app/workers/user_activate_worker.rb @@ -6,7 +6,7 @@ def perform(user_id) user = User.find(user_id) return if user.active? - RefreshUserJob.new.perform(user.username) + RefreshUserJob.new.perform(user.id) NotifierMailer.welcome_email(user.username).deliver user.activate! diff --git a/spec/workers/user_activate_worker_spec.rb b/spec/workers/user_activate_worker_spec.rb index 6f17dcf3..554ba49a 100644 --- a/spec/workers/user_activate_worker_spec.rb +++ b/spec/workers/user_activate_worker_spec.rb @@ -22,6 +22,19 @@ expect(user.active?).to eq(true) expect(user.activated_on).not_to eq(nil) end + + it "should send welcome mail" do + mail = double("mail") + expect(NotifierMailer).to receive(:welcome_email).with(user.username).and_return(mail) + expect(mail).to receive(:deliver) + worker.perform(user.id) + end + + it "should create refresh job" do + expect_any_instance_of(RefreshUserJob).to receive(:perform).with(user.id) + worker.perform(user.id) + end + end context 'when activate user' do