mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Add navigational_formats
internal helper which filters out wildcard
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
parent
97f0bacfa0
commit
b6652abc7c
2 changed files with 13 additions and 1 deletions
|
@ -59,7 +59,12 @@ module Devise
|
|||
|
||||
# Check whether it's navigational format, such as :html or :iphone, or not.
|
||||
def is_navigational_format?
|
||||
Devise.navigational_formats.include?(request.format.to_sym)
|
||||
navigational_formats.include?(request.format.to_sym)
|
||||
end
|
||||
|
||||
# Returns real navigational formats which supported by Rails
|
||||
def navigational_formats
|
||||
@navigational_formats ||= Devise.navigational_formats.select{ |format| Mime::EXTENSION_LOOKUP[format.to_s] }
|
||||
end
|
||||
|
||||
def unknown_action!(msg)
|
||||
|
|
|
@ -69,4 +69,11 @@ class HelpersTest < ActionController::TestCase
|
|||
assert flash[:notice] == 'non-blank'
|
||||
MyController.send(:protected, :set_flash_message)
|
||||
end
|
||||
|
||||
test 'navigational_formats not returning a wild card' do
|
||||
MyController.send(:public, :navigational_formats)
|
||||
Devise.navigational_formats = [:"*/*", :html]
|
||||
assert_not @controller.navigational_formats.include?(:"*/*")
|
||||
MyController.send(:protected, :navigational_formats)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue