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

FEATURE: remove email_token_grace_period_hours

Browse Source 
The site setting email_token_grace_period_hours just causes confusion and
should not be used anyway.

Out of the box, tokens stop working once confirmed, no need to add complexity here
This commit is contained in:
Sam
2016-12-19 17:15:20 +11:00
parent 7918d99a2e
commit eb2db23b40
5 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spec/models/email_token_spec.rb
View File

@ -90,16 +90,6 @@ describe EmailToken do
expect(user.send_welcome_message).to eq true
end
context "when using the code a second time" do
it "doesn't send the welcome message" do
SiteSetting.email_token_grace_period_hours = 1
EmailToken.confirm(email_token.token)
user = EmailToken.confirm(email_token.token)
expect(user.send_welcome_message).to eq false
end
end
end
context 'success' do
@ -120,13 +110,7 @@ describe EmailToken do
expect(email_token).to be_confirmed
end
it "can be confirmed again" do
EmailToken.stubs(:confirm_valid_after).returns(1.hour.ago)
expect(EmailToken.confirm(email_token.token)).to eq user
# Unless `confirm_valid_after` has passed
EmailToken.stubs(:confirm_valid_after).returns(1.hour.from_now)
it "will not confirm again" do
expect(EmailToken.confirm(email_token.token)).to be_blank
end
end