diff --git a/lib/devise/strategies/authenticatable.rb b/lib/devise/strategies/authenticatable.rb index 9108e727..e23bf0eb 100644 --- a/lib/devise/strategies/authenticatable.rb +++ b/lib/devise/strategies/authenticatable.rb @@ -156,4 +156,4 @@ module Devise end end end -end \ No newline at end of file +end diff --git a/test/integration/token_authenticatable_test.rb b/test/integration/token_authenticatable_test.rb index f2ccc8ac..084cfc7a 100644 --- a/test/integration/token_authenticatable_test.rb +++ b/test/integration/token_authenticatable_test.rb @@ -112,7 +112,7 @@ class TokenAuthenticationTest < ActionController::IntegrationTest assert_not_equal user1, user2 visit users_path(Devise.token_authentication_key.to_s + '[$ne]' => user1.authentication_token) - assert_nil warden.user(:user) + assert_nil warden.user(:user) end end @@ -145,4 +145,4 @@ class TokenAuthenticationTest < ActionController::IntegrationTest sign_in_as_new_user_with_token(:user => user) end -end \ No newline at end of file +end diff --git a/test/integration/trackable_test.rb b/test/integration/trackable_test.rb index d3aef96b..d02a1d7d 100644 --- a/test/integration/trackable_test.rb +++ b/test/integration/trackable_test.rb @@ -36,10 +36,10 @@ class TrackableHooksTest < ActionController::IntegrationTest assert_equal "127.0.0.1", user.current_sign_in_ip assert_equal "127.0.0.1", user.last_sign_in_ip end - + test "current remote ip returns original ip behind a non transparent proxy" do user = create_user - + arbitrary_ip = '192.168.1.69' sign_in_as_user do header 'HTTP_X_FORWARDED_FOR', arbitrary_ip @@ -72,7 +72,7 @@ class TrackableHooksTest < ActionController::IntegrationTest assert_nil user.last_sign_in_at end end - + test "do not track if devise.skip_trackable is set" do user = create_user sign_in_as_user do @@ -81,7 +81,7 @@ class TrackableHooksTest < ActionController::IntegrationTest user.reload assert_equal 0, user.sign_in_count visit destroy_user_session_path - + sign_in_as_user do header 'devise.skip_trackable', false end