Skip to content

Commit

Permalink
Merge pull request heartcombo#1998 from fabiokr/update_attribute
Browse files Browse the repository at this point in the history
Replaces update_attribute with update_column
  • Loading branch information
rafaelfranca committed Jul 27, 2012
2 parents 2f75b12 + 7d41072 commit 6ae64b1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/devise/hooks/lockable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# This is only triggered when the user is explicitly set (with set_user)
Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
record.update_attribute(:failed_attempts, 0)
record.update_column(:failed_attempts, 0)
end
end
2 changes: 1 addition & 1 deletion test/integration/http_authenticatable_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class HttpAuthenticationTest < ActionController::IntegrationTest
test 'sign in should authenticate with really long token' do
token = "token_containing_so_many_characters_that_the_base64_encoding_will_wrap"
user = create_user
user.update_attribute :authentication_token, token
user.update_column :authentication_token, token
get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{token}:x")}"
assert_response :success
assert_match "<email>[email protected]</email>", response.body
Expand Down
2 changes: 1 addition & 1 deletion test/integration/recoverable_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def reset_password(options={}, &block)

test "after recovering a password, should set failed attempts to 0" do
user = create_user
user.update_attribute(:failed_attempts, 10)
user.update_column(:failed_attempts, 10)

assert_equal 10, user.failed_attempts
request_forgot_password
Expand Down
2 changes: 1 addition & 1 deletion test/integration/token_authenticatable_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class TokenAuthenticationTest < ActionController::IntegrationTest
@user = nil

user2 = create_user_with_authentication_token(:email => "[email protected]")
user2.update_attribute(:authentication_token, "ANOTHERTOKEN")
user2.update_column(:authentication_token, "ANOTHERTOKEN")

assert_not_equal user1, user2
visit users_path(Devise.token_authentication_key.to_s + '[$ne]' => user1.authentication_token)
Expand Down

0 comments on commit 6ae64b1

Please sign in to comment.