diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-03-01 19:01:18 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-01 19:04:32 +0300 |
commit | c05bb007370256bf45315eb2ee55c86e329f2654 (patch) | |
tree | a59c3fbb0012e1cbda206820f7a8a74b769712c6 /spec | |
parent | e11ab453ee4feb1926464b0060a46e4294e61c35 (diff) |
Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required
Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.
See merge request !3014
Diffstat (limited to 'spec')
-rw-r--r-- | spec/factories.rb | 1 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index 2a81684dfcf..d6483ed6ce8 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -32,6 +32,7 @@ FactoryGirl.define do before(:create) do |user| user.two_factor_enabled = true user.otp_secret = User.generate_otp_secret(32) + user.otp_grace_period_started_at = Time.now user.generate_otp_backup_codes! end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 32d4f39b04a..95188f518c1 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -256,6 +256,7 @@ describe User, models: true do expect(user).to be_two_factor_enabled expect(user.encrypted_otp_secret).not_to be_nil expect(user.otp_backup_codes).not_to be_nil + expect(user.otp_grace_period_started_at).not_to be_nil user.disable_two_factor! @@ -264,6 +265,7 @@ describe User, models: true do expect(user.encrypted_otp_secret_iv).to be_nil expect(user.encrypted_otp_secret_salt).to be_nil expect(user.otp_backup_codes).to be_nil + expect(user.otp_grace_period_started_at).to be_nil end end |