diff --git a/config/locales/devise_invitable.en.yml b/config/locales/devise_invitable.en.yml index 22ec7d00a2..ba47068d82 100644 --- a/config/locales/devise_invitable.en.yml +++ b/config/locales/devise_invitable.en.yml @@ -21,7 +21,7 @@ en: hello: "Hello %{email}" someone_invited_you: "Someone has invited you to %{url}, you can accept it through the link below." accept: "Accept invitation" - accept_until: "This invitation will be due in %{due_date} GMT." + accept_until: "This invitation will expire at %{due_date} GMT or if a new password reset is triggered." ignore: "If you don't want to accept the invitation, please ignore this email.
\nYour account won't be created until you access the link above and set your password." time: formats: diff --git a/spec/mailers/custom_devise_mailer_spec.rb b/spec/mailers/custom_devise_mailer_spec.rb index 61b0ed9a53..a79167e717 100644 --- a/spec/mailers/custom_devise_mailer_spec.rb +++ b/spec/mailers/custom_devise_mailer_spec.rb @@ -40,8 +40,8 @@ expect(mail.html_part.body).to include("Your request has been approved and you're invited to become an user of the Human Essentials inventory management system!") end - it "has invite expiration message" do - expect(mail.html_part.body).to include("This invitation will be due in #{user.invitation_due_at.strftime("%B %d, %Y %I:%M %p")} GMT.") + it "has invite expiration message and reset instructions" do + expect(mail.html_part.body).to include("This invitation will expire at #{user.invitation_due_at.strftime("%B %d, %Y %I:%M %p")} GMT or if a new password reset is triggered.") end it "has reset instructions" do