mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 04:31:56 +08:00
dbb3ddc7a6
This commit fixes the case where invited users who typed in a password would not be approved by default. Because we moved the user create logic for an invited user there was a clash with the `save` in the user model and the `save` in the invite_redeemer class. - added approve logic into invite_redeemer class. - added tests to verify that the user is approved - added a check to see if must_approve_users is on - added a check to see if the inviter is staff - go ahead and approve the user if must_approve_users is off - keep existing User.approve workflow if user exists - improve if/else logic to remove duplicate code - use `Time.zone.now`
98 lines
3.2 KiB
Ruby
98 lines
3.2 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe InviteRedeemer do
|
|
|
|
describe '#create_user_from_invite' do
|
|
it "should be created correctly" do
|
|
user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com'), 'walter', 'Walter White')
|
|
expect(user.username).to eq('walter')
|
|
expect(user.name).to eq('Walter White')
|
|
expect(user).to be_active
|
|
expect(user.email).to eq('walter.white@email.com')
|
|
expect(user.approved).to eq(true)
|
|
end
|
|
|
|
it "can set the password too" do
|
|
password = 's3cure5tpasSw0rD'
|
|
user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com'), 'walter', 'Walter White', password)
|
|
expect(user).to have_password
|
|
expect(user.confirm_password?(password)).to eq(true)
|
|
expect(user.approved).to eq(true)
|
|
end
|
|
|
|
it "raises exception with record and errors" do
|
|
error = nil
|
|
begin
|
|
InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'walter.white@email.com'), 'walter', 'Walter White', 'aaa')
|
|
rescue ActiveRecord::RecordInvalid => e
|
|
error = e
|
|
end
|
|
expect(error).to be_present
|
|
expect(error.record.errors[:password]).to be_present
|
|
end
|
|
end
|
|
|
|
describe "#redeem" do
|
|
let(:invite) { Fabricate(:invite) }
|
|
let(:name) { 'john snow' }
|
|
let(:username) { 'kingofthenorth' }
|
|
let(:password) { 'know5nOthiNG'}
|
|
let(:invite_redeemer) { InviteRedeemer.new(invite, username, name) }
|
|
|
|
it "should redeem the invite if invited by staff" do
|
|
SiteSetting.must_approve_users = true
|
|
inviter = invite.invited_by
|
|
inviter.admin = true
|
|
user = invite_redeemer.redeem
|
|
|
|
expect(user.name).to eq(name)
|
|
expect(user.username).to eq(username)
|
|
expect(user.invited_by).to eq(inviter)
|
|
expect(inviter.notifications.count).to eq(1)
|
|
expect(user.approved).to eq(true)
|
|
end
|
|
|
|
it "should redeem the invite if invited by non staff but not approve" do
|
|
SiteSetting.must_approve_users = true
|
|
inviter = invite.invited_by
|
|
user = invite_redeemer.redeem
|
|
|
|
expect(user.name).to eq(name)
|
|
expect(user.username).to eq(username)
|
|
expect(user.invited_by).to eq(inviter)
|
|
expect(inviter.notifications.count).to eq(1)
|
|
expect(user.approved).to eq(false)
|
|
end
|
|
|
|
it "should redeem the invite if invited by non staff and approve if staff not required to approve" do
|
|
inviter = invite.invited_by
|
|
user = invite_redeemer.redeem
|
|
|
|
expect(user.name).to eq(name)
|
|
expect(user.username).to eq(username)
|
|
expect(user.invited_by).to eq(inviter)
|
|
expect(inviter.notifications.count).to eq(1)
|
|
expect(user.approved).to eq(true)
|
|
end
|
|
|
|
it "should not blow up if invited_by user has been removed" do
|
|
invite.invited_by.destroy!
|
|
invite.reload
|
|
|
|
user = invite_redeemer.redeem
|
|
|
|
expect(user.name).to eq(name)
|
|
expect(user.username).to eq(username)
|
|
expect(user.invited_by).to eq(nil)
|
|
end
|
|
|
|
it "can set password" do
|
|
inviter = invite.invited_by
|
|
user = InviteRedeemer.new(invite, username, name, password).redeem
|
|
expect(user).to have_password
|
|
expect(user.confirm_password?(password)).to eq(true)
|
|
expect(user.approved).to eq(true)
|
|
end
|
|
end
|
|
end
|