From f968b4e6629c352e9f5425e35f5dcbe72f4fbe88 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 18 Apr 2017 16:34:21 +0530 Subject: [PATCH] Fix the build --- spec/controllers/invites_controller_spec.rb | 13 ++++++++++ spec/models/invite_spec.rb | 27 --------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb index 9fc4019e383..90795927759 100644 --- a/spec/controllers/invites_controller_spec.rb +++ b/spec/controllers/invites_controller_spec.rb @@ -243,8 +243,21 @@ describe InvitesController do xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json end + it "does not send password reset email if sso is enabled" do + SiteSetting.enable_sso = true + Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never + xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json + end + + it "does not send password reset email if local login is disabled" do + SiteSetting.enable_local_logins = false + Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).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(:invite_password_instructions_email, has_key(:username)).never 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 diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb index 48cac4af4d1..7bba547df88 100644 --- a/spec/models/invite_spec.rb +++ b/spec/models/invite_spec.rb @@ -213,33 +213,6 @@ describe Invite do end - context 'enqueues a job to email "set password" instructions' do - - it 'does not enqueue an email if sso is enabled' do - SiteSetting.stubs(:enable_sso).returns(true) - Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never - invite.redeem - end - - it 'does not enqueue an email if local login is disabled' do - SiteSetting.stubs(:enable_local_logins).returns(false) - Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never - invite.redeem - end - - it 'does not enqueue an email if the user has already set password' do - Fabricate(:user, email: invite.email, password_hash: "7af7805c9ee3697ed1a83d5e3cb5a3a431d140933a87fdcdc5a42aeef9337f81") - Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never - invite.redeem - end - - it 'enqueues an email if all conditions are satisfied' do - Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)) - invite.redeem - end - - end - context "as a moderator" do it "will give the user a moderator flag" do invite.invited_by = Fabricate(:admin)