diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-12-09 18:34:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 18:34:34 -0500 |
| commit | 1b24fb213b820ebca29eb1d38efb07a410c7afaa (patch) | |
| tree | 1a5318f23c7342d2980917a985277c61cf7204b6 /actionpack/lib | |
| parent | 5d7b70f4336d42eabfc403e9f6efceb88b3eff44 (diff) | |
| parent | f1b4cd1ad47eab55ab7b18ae0cc167fabf72f38b (diff) | |
| download | rails-1b24fb213b820ebca29eb1d38efb07a410c7afaa.tar.gz rails-1b24fb213b820ebca29eb1d38efb07a410c7afaa.tar.bz2 rails-1b24fb213b820ebca29eb1d38efb07a410c7afaa.zip | |
Merge pull request #31384 from rails/dont-override-server
Change the system tests to set Puma as default server only when the user haven't specified manually another server.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/system_testing/server.rb | 2 |
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 8f1b6725b1..4fc1f33767 100644 --- a/actionpack/lib/action_dispatch/system_testing/server.rb +++ b/actionpack/lib/action_dispatch/system_testing/server.rb @@ -20,7 +20,7 @@ module ActionDispatch end def set_server - Capybara.server = :puma, { Silent: self.class.silence_puma } + Capybara.server = :puma, { Silent: self.class.silence_puma } if Capybara.server == Capybara.servers[:default] end def set_port |