diff --git a/Gemfile.lock b/Gemfile.lock index ebf87d07..e7d56075 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - devise (2.0.4) + devise (2.0.5) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) railties (~> 3.1) diff --git a/lib/devise/models/authenticatable.rb b/lib/devise/models/authenticatable.rb index 503036f9..775c1da1 100644 --- a/lib/devise/models/authenticatable.rb +++ b/lib/devise/models/authenticatable.rb @@ -155,7 +155,7 @@ module Devise # Example: # # def self.find_for_authentication(tainted_conditions) - # find_first_by_auth_conditions(tainted_conditions, active: true) + # find_first_by_auth_conditions(tainted_conditions, :active => true) # end # # Finally, notice that Devise also queries for users in other scenarios diff --git a/test/models/authenticatable_test.rb b/test/models/authenticatable_test.rb index 17829b84..b3eb9879 100644 --- a/test/models/authenticatable_test.rb +++ b/test/models/authenticatable_test.rb @@ -2,8 +2,8 @@ require 'test_helper' class AuthenticatableTest < ActiveSupport::TestCase test 'find_first_by_auth_conditions allows custom filtering parameters' do - user = User.create!(email: "example@example.com", password: "123456") - assert_equal User.find_first_by_auth_conditions({ email: "example@example.com" }), user - assert_equal User.find_first_by_auth_conditions({ email: "example@example.com" }, id: user.id + 1), nil + user = User.create!(:email => "example@example.com", :password => "123456") + assert_equal User.find_first_by_auth_conditions({ :email => "example@example.com" }), user + assert_equal User.find_first_by_auth_conditions({ :email => "example@example.com" }, :id => user.id + 1), nil end end