kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

failure_app now properly handles nil request.format

Browse source
This commit is contained in:
José Valim 2010-11-09 23:30:53 +01:00
parent 07fedb4383
commit 505bd39700
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/devise/failure_app.rb
View file

@ -79,7 +79,7 @@ module Devise
if request.xhr?
Devise.http_authenticatable_on_xhr
else
!Devise.navigational_formats.include?(request.format.to_sym)
!(request.format && Devise.navigational_formats.include?(request.format.to_sym))
end
end
@ -90,7 +90,8 @@ module Devise
end
def http_auth_body
method = :"to_#{request.format.to_sym}"
return i18n_message unless request.format
method = "to_#{request.format.to_sym}"
{}.respond_to?(method) ? { :error => i18n_message }.send(method) : i18n_message
end

5
test/failure_app_test.rb
View file

@ -77,6 +77,11 @@ class FailureTest < ActiveSupport::TestCase
assert_equal 401, @response.first
end
test 'return 401 status for unknown formats' do
call_failure 'formats' => []
assert_equal 401, @response.first
end
test 'return WWW-authenticate headers if model allows' do
call_failure('formats' => :xml)
assert_equal 'Basic realm="Application"', @response.second["WWW-Authenticate"]