add puma

michelc · Mar 8, 2012 · de02cb4 · de02cb4
1 parent 41c5529
commit de02cb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -1566,7 +1566,7 @@ class << self
 
     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
 

diff --git a/test/settings_test.rb b/test/settings_test.rb
@@ -422,9 +422,9 @@ def pub; end
   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