Adjust #accept? to check if type is included in #preferred_type
- 960 tests, 2083 assertions, 0 failures, 0 errors, 0 skips
This commit is contained in:
parent
c7aa44f01f
commit
bce185f196
|
@ -27,6 +27,10 @@ module Sinatra
|
|||
end
|
||||
end
|
||||
|
||||
def accept?(type)
|
||||
preferred_type.include?(type)
|
||||
end
|
||||
|
||||
def preferred_type(*types)
|
||||
accepts = accept # just evaluate once
|
||||
return accepts.first if types.empty?
|
||||
|
@ -38,7 +42,6 @@ module Sinatra
|
|||
end
|
||||
end
|
||||
|
||||
alias accept? preferred_type
|
||||
alias secure? ssl?
|
||||
|
||||
def forwarded?
|
||||
|
|
|
@ -52,6 +52,7 @@ class RequestTest < Test::Unit::TestCase
|
|||
|
||||
it "makes accept types behave like strings" do
|
||||
request = Sinatra::Request.new('HTTP_ACCEPT' => 'image/jpeg; compress=0.25')
|
||||
assert request.accept?('image/jpeg')
|
||||
assert_equal 'image/jpeg', request.preferred_type.to_s
|
||||
assert_equal 'image/jpeg', request.preferred_type.to_str
|
||||
assert_equal 'image', request.preferred_type.split('/').first
|
||||
|
|
Loading…
Reference in New Issue