Mark the token as expired, because invalid gives no clue of what to d…

…o next.
twalpole · Apr 21, 2011 · 624fb56 · 624fb56
1 parent 76edb49
commit 624fb56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -3,6 +3,7 @@
 en:
   errors:
     messages:
+      expired: "has expired, please request a new one"
       not_found: "not found"
       already_confirmed: "was already confirmed, please try signing in"
       not_locked: "was not locked"

diff --git a/lib/devise/models/recoverable.rb b/lib/devise/models/recoverable.rb
@@ -116,7 +116,7 @@ def reset_password_by_token(attributes={})
             if recoverable.reset_password_period_valid?
               recoverable.reset_password!(attributes[:password], attributes[:password_confirmation]) 
             else
-              recoverable.errors.add(:reset_password_token, :invalid)
+              recoverable.errors.add(:reset_password_token, :expired)
             end
           end
           recoverable

diff --git a/test/models/recoverable_test.rb b/test/models/recoverable_test.rb
@@ -192,7 +192,7 @@ def setup
 
       assert user.valid_password?(old_password)
       assert_not user.valid_password?('new_password')
-      assert_equal "is invalid", reset_password_user.errors[:reset_password_token].join
+      assert_equal "has expired, please request a new one", reset_password_user.errors[:reset_password_token].join
     end
   end