From f1b4cd1ad47eab55ab7b18ae0cc167fabf72f38b Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Sat, 9 Dec 2017 16:46:31 -0500 Subject: Change the system tests to set Puma as default server only when the user haven't specified manually another server. --- actionpack/lib/action_dispatch/system_testing/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib') 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 -- cgit v1.2.3