aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2017-03-05 09:00:32 -0500
committereileencodes <eileencodes@gmail.com>2017-03-05 09:00:32 -0500
commitfea0c351072714083bcf2a23cf659b6c4ef32124 (patch)
tree6dc1a576e7a8dea2f4c376eba66c0f63a2041043
parent797ed5e61fc906eaa639c14cc063aacdd7f7c68c (diff)
downloadrails-fea0c351072714083bcf2a23cf659b6c4ef32124.tar.gz
rails-fea0c351072714083bcf2a23cf659b6c4ef32124.tar.bz2
rails-fea0c351072714083bcf2a23cf659b6c4ef32124.zip
Revert "Merge pull request #28283 from y-yagi/silence_puma_startup_messages_in_system_test"
This reverts commit 0d73f9116ccd3ded23e69d70ff5ed23dd339df5b, reversing changes made to 21ff8a493206cd50558b03975a7eaaaeb6ec7900. We don't want to silence Puma because it's start up messages can be useful (to see threads, port etc). #28109 was instead fixed by not running system tests by defaul with `bin/rails test` in #28286.
-rw-r--r--actionpack/lib/action_dispatch/system_testing/server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/server.rb b/actionpack/lib/action_dispatch/system_testing/server.rb
index ee4b7efce0..4a214ef713 100644
--- a/actionpack/lib/action_dispatch/system_testing/server.rb
+++ b/actionpack/lib/action_dispatch/system_testing/server.rb
@@ -11,7 +11,7 @@ module ActionDispatch
private
def register
Capybara.register_server :rails_puma do |app, port, host|
- Rack::Handler::Puma.run(app, Port: port, Threads: "0:1", Silent: true)
+ Rack::Handler::Puma.run(app, Port: port, Threads: "0:1")
end
end