Made ensure valid a named param for confirm!, and added a test.

rosenfeld · Nov 19, 2014 · 3b882da · 3b882da
1 parent 4ba84ee
commit 3b882da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/devise/models/confirmable.rb b/lib/devise/models/confirmable.rb
@@ -56,7 +56,7 @@ def self.required_fields(klass)
       # Confirm a user by setting it's confirmed_at to actual time. If the user
       # is already confirmed, add an error to email field. If the user is invalid
       # add errors
-      def confirm!(ensure_valid=false)
+      def confirm!(ensure_valid: false)
         pending_any_confirmation do
           if confirmation_period_expired?
             self.errors.add(:email, :confirmation_period_expired,

diff --git a/test/models/confirmable_test.rb b/test/models/confirmable_test.rb
@@ -315,6 +315,12 @@ def confirm_user_by_token_with_confirmation_sent_at(confirmation_sent_at)
     assert_not user.confirm!
     assert_equal user.username, old
   end
+
+  test 'should always perform validations upon confirm when ensure valid true' do
+    admin = create_admin
+    admin.stubs(:valid?).returns(false)
+    assert_not admin.confirm!(ensure_valid: true)
+  end
 end
 
 class ReconfirmableTest < ActiveSupport::TestCase