diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-09-18 16:46:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 16:46:26 -0400 |
| commit | 42d09f6b49da619952267b22bd8800d9b816886b (patch) | |
| tree | 7d80fa1529ca0e7c11b31c642e9cf9a0ea55a533 /actionpack/lib/action_dispatch/system_testing/server.rb | |
| parent | e4017d0288fff13be9e97335c37ebbd30d1e94ea (diff) | |
| parent | ba04b580c6e56e366b1b8e4ef003e9a0c1c419bb (diff) | |
| download | rails-42d09f6b49da619952267b22bd8800d9b816886b.tar.gz rails-42d09f6b49da619952267b22bd8800d9b816886b.tar.bz2 rails-42d09f6b49da619952267b22bd8800d9b816886b.zip | |
Merge pull request #30638 from twalpole/capybara_server
Use the default Capybara registered puma server configuration
Diffstat (limited to 'actionpack/lib/action_dispatch/system_testing/server.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/system_testing/server.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/server.rb b/actionpack/lib/action_dispatch/system_testing/server.rb index 76bada8df1..32aa6a4dc4 100644 --- a/actionpack/lib/action_dispatch/system_testing/server.rb +++ b/actionpack/lib/action_dispatch/system_testing/server.rb @@ -12,29 +12,17 @@ module ActionDispatch self.silence_puma = false def run - register setup end private - def register - Capybara.register_server :rails_puma do |app, port, host| - Rack::Handler::Puma.run( - app, - Port: port, - Threads: "0:1", - Silent: self.class.silence_puma - ) - end - end - def setup set_server set_port end def set_server - Capybara.server = :rails_puma + Capybara.server = :puma, { Silent: self.class.silence_puma } end def set_port |