Add Reel support.

Closes #793 and #774
This commit is contained in:
Zachary Scott 2016-01-31 20:51:16 +09:00
parent df3d7fd5ec
commit e61370a095
4 changed files with 9 additions and 2 deletions

View File

@ -4,6 +4,8 @@
* Make `not_found` and `error(404)` behavior match. #896 (Jeremy Evans)
* Add Reel support. #793 (Patricio Mac Adden)
= 1.4.7 / 2016-01-24
* Add Ashley Williams, Trevor Bramble, and Kashyap Kondamudi to team Sinatra.

View File

@ -54,6 +54,7 @@ if RUBY_ENGINE == "ruby"
gem 'erubis'
gem 'haml', '>= 3.0'
gem 'sass'
gem 'reel-rack'
end
if RUBY_ENGINE == "rbx"

View File

@ -140,6 +140,10 @@ module IntegrationHelper
name.to_s == "puma"
end
def reel?
name.to_s == "reel"
end
def trinidad?
name.to_s == "trinidad"
end

View File

@ -17,7 +17,7 @@ class IntegrationTest < Minitest::Test
random = "%064x" % Kernel.rand(2**256-1)
server.get "/ping?x=#{random}"
count = server.log.scan("GET /ping?x=#{random}").count
if server.net_http_server?
if server.net_http_server? || server.reel?
assert_equal 0, count
elsif server.webrick?
assert(count > 0)
@ -83,7 +83,7 @@ class IntegrationTest < Minitest::Test
}ix
# because Net HTTP Server logs to $stderr by default
assert_match exp, server.log unless server.net_http_server?
assert_match exp, server.log unless server.net_http_server? || server.reel?
end
it 'does not generate warnings' do