Added required_fields when reconfirmable

twalpole · Feb 22, 2012 · a909bfa · a909bfa
1 parent bc11e9f
commit a909bfa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/devise/models/confirmable.rb b/lib/devise/models/confirmable.rb
@@ -37,7 +37,12 @@ module Confirmable
       end
 
       def self.required_fields(klass)
-        [:confirmation_token, :confirmed_at, :confirmation_sent_at]
+        required_methods = [:confirmation_token, :confirmed_at, :confirmation_sent_at]
+        if klass.reconfirmable
+          required_methods << :unconfirmed_email
+        end
+
+        required_methods
       end
 
       # Confirm a user by setting it's confirmed_at to actual time. If the user

diff --git a/test/models/confirmable_test.rb b/test/models/confirmable_test.rb
@@ -336,4 +336,13 @@ class ReconfirmableTest < ActiveSupport::TestCase
       :confirmed_at
     ]
   end
+
+  test 'required_fields should also contain unconfirmable when reconfirmable_email is true' do
+    assert_same_content Devise::Models::Confirmable.required_fields(Admin), [
+      :confirmation_sent_at,
+      :confirmation_token,
+      :confirmed_at,
+      :unconfirmable_email
+    ]
+  end
 end