kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

add puma

Browse source
This commit is contained in:
Konstantin Haase 2012-03-08 09:11:11 +01:00
parent 41c552993b
commit de02cb427b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/sinatra/base.rb
View file

@ -1566,7 +1566,7 @@ module Sinatra
set :run, false # start server via at-exit hook?
set :running, false # is the built-in server running now?
set :server, %w[thin mongrel webrick]
set :server, %w[thin puma mongrel webrick]
set :bind, '0.0.0.0'
set :port, 4567

6
test/settings_test.rb
View file

@ -422,9 +422,9 @@ class SettingsTest < Test::Unit::TestCase
end
describe 'server' do
it 'is one of thin, mongrel, webrick' do
assert_equal %w[thin mongrel webrick], @base.server
assert_equal %w[thin mongrel webrick], @application.server
it 'is one of thin, puma, mongrel, webrick' do
assert_equal %w[thin puma mongrel webrick], @base.server
assert_equal %w[thin puma mongrel webrick], @application.server
end
end