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

FIX: Use updated_at date to denote expired invites (#8521)

Browse Source
This commit is contained in:
Penar Musaraj
2019-12-17 10:13:49 -05:00
committed by GitHub
parent 8106d94c05
commit ea05a68df7
6 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/models/invite_spec.rb
View File

@ -109,7 +109,6 @@ describe Invite do
expect(new_invite.invite_key).not_to eq(invite.invite_key)
expect(new_invite.topics).to eq([topic])
end
end
context 'when adding a duplicate' do
@ -137,7 +136,7 @@ describe Invite do
it 'returns a new invite if the other has expired' do
SiteSetting.invite_expiry_days = 1
invite.update!(created_at: 2.days.ago)
invite.update!(updated_at: 2.days.ago)
new_invite = Invite.invite_by_email(
'iceking@adventuretime.ooo', inviter, topic
@ -159,6 +158,15 @@ describe Invite do
end
end
it 'resets expiry of a resent invite' do
SiteSetting.invite_expiry_days = 2
invite.update!(updated_at: 10.days.ago)
expect(invite).to be_expired
invite.resend_invite
expect(invite).not_to be_expired
end
it 'correctly marks invite emailed_status for email invites' do
expect(invite.emailed_status).to eq(Invite.emailed_status_types[:sending])
@ -214,7 +222,7 @@ describe Invite do
it 'wont redeem an expired invite' do
SiteSetting.invite_expiry_days = 10
invite.update_column(:created_at, 20.days.ago)
invite.update_column(:updated_at, 20.days.ago)
expect(invite.redeem).to be_blank
end
@ -493,7 +501,7 @@ describe Invite do
invite_1 = Fabricate(:invite, invited_by: user)
invite_2 = Fabricate(:invite, invited_by: user)
expired_invite = Fabricate(:invite, invited_by: user)
expired_invite.update!(created_at: 2.days.ago)
expired_invite.update!(updated_at: 2.days.ago)
Invite.rescind_all_expired_invites_from(user)
invite_1.reload
invite_2.reload